[SCM] jack-audio-connection-kit/master: Drop SH4 patch

adiknoth-guest at users.alioth.debian.org adiknoth-guest at users.alioth.debian.org
Tue Sep 6 15:17:55 UTC 2011


The following commit has been merged in the master branch:
commit e2f84091368e4669a13f27a5dbedb6a436599e0d
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Tue Sep 6 16:54:11 2011 +0200

    Drop SH4 patch
    
    The patch was integrated upstream.

diff --git a/debian/patches/sh4.patch b/debian/patches/sh4.patch
deleted file mode 100644
index 6e6e0c6..0000000
--- a/debian/patches/sh4.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
-Forwarded: http://trac.jackaudio.org/ticket/224
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=623295
-Description: Make it work on SH4 architectures
-diff --git a/config/os/gnu-linux/time.c b/config/os/gnu-linux/time.c
-index 0fc6ae6..7301200 100644
---- a/config/os/gnu-linux/time.c
-+++ b/config/os/gnu-linux/time.c
-@@ -157,6 +157,8 @@ jack_get_mhz (void)
- 		ret = sscanf(buf, "Clocking:       %" SCNu64, &mhz);
- #elif defined( __s390__  )
- 		ret = sscanf(buf, "bogomips per cpu: %" SCNu64, &mhz);
-+#elif defined( __sh__  )
-+		ret = sscanf(buf, "bogomips        : %" SCNu64, &mhz);
- #else /* MIPS, ARM, alpha */
- 		ret = sscanf(buf, "BogoMIPS        : %" SCNu64, &mhz);
- #endif 
-diff --git a/drivers/oss/oss_driver.c b/drivers/oss/oss_driver.c
-index e2d417b..0c3605d 100644
---- a/drivers/oss/oss_driver.c
-+++ b/drivers/oss/oss_driver.c
-@@ -1244,7 +1244,7 @@ jack_driver_t * driver_initialize (jack_client_t *client,
- 	{
- #		ifndef OSS_ENDIAN
- #		ifdef __GNUC__
--#		if (defined(__i386__) || defined(__alpha__) || defined(__arm__) || defined(__x86_64__))
-+#		if (defined(__i386__) || defined(__alpha__) || defined(__arm__) || defined(__x86_64__) || (defined(__sh__) && !defined(__LITTLE_ENDIAN__)))
- #		define OSS_LITTLE_ENDIAN 1234
- #		define OSS_ENDIAN OSS_LITTLE_ENDIAN
- #		else

-- 
Debian packaging for jack-audio-connection-kit



More information about the pkg-multimedia-commits mailing list