[SCM] xvidcore/master: Add patch by Pino Toscano to add support for GNU Hurd as target OS, requires running autoconf (Closes: #635662).
fabian-guest at users.alioth.debian.org
fabian-guest at users.alioth.debian.org
Thu Jul 28 07:36:33 UTC 2011
The following commit has been merged in the master branch:
commit 9c63134b08a8d477193bda21940ab2dd634db879
Author: Fabian Greffrath <fabian at greffrath.com>
Date: Thu Jul 28 09:37:23 2011 +0200
Add patch by Pino Toscano to add support for GNU Hurd as target OS, requires running autoconf (Closes: #635662).
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..ebe296d
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+uild/generic/configure
diff --git a/debian/control b/debian/control
index c598150..8166814 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,8 @@ Uploaders: Loïc Martin <loic.martin3 at gmail.com>,
Fabian Greffrath <fabian+debian at greffrath.com>,
Andres Mejia <amejia at debian.org>
Build-Depends: debhelper (>= 7.3~),
- yasm (>= 1.0) [i386 amd64]
+ yasm (>= 1.0) [i386 amd64],
+ autoconf
Standards-Version: 3.9.2
DM-Upload-Allowed: yes
Homepage: http://www.xvid.org/
diff --git a/debian/patches/hurd.diff b/debian/patches/hurd.diff
new file mode 100644
index 0000000..8630d3f
--- /dev/null
+++ b/debian/patches/hurd.diff
@@ -0,0 +1,37 @@
+Description: xvidcore: FTBFS on hurd-i386: unrecognized platform
+ Currently, xvidcore does not compile on hurd-i386.
+ The problem is the lack of support for GNU/Hurd in configure;
+ the attached patch (which requires autoreconf) provides it.
+Author: Pino Toscano <pino at debian.org>
+Bug-Debian: http://bugs.debian.org/635662
+Forwarded: Michael Militzer <michael at xvid.org>
+
+--- a/build/generic/configure.in
++++ b/build/generic/configure.in
+@@ -237,7 +237,7 @@
+ STATIC_EXTENSION=""
+ OBJECT_EXTENSION=""
+ case "$target_os" in
+- *bsd*|linux*|beos|irix*|solaris*)
++ *bsd*|linux*|beos|irix*|solaris*|gnu*)
+ AC_MSG_RESULT([.so .a .o])
+ STATIC_EXTENSION="a"
+ SHARED_EXTENSION="so"
+@@ -281,7 +281,7 @@
+ ALTIVEC_CFLAGS=""
+ PRE_SHARED_LIB=""
+ case "$target_os" in
+- linux*|solaris*)
++ linux*|solaris*|gnu*)
+ AC_MSG_RESULT([ok])
+ STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
+ SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)"
+@@ -419,7 +419,7 @@
+ if test "$found_nasm_comp_prog" = "yes" ; then
+ AC_MSG_CHECKING([for asm object format])
+ case "$target_os" in
+- *bsd*|linux*|beos|irix*|solaris*)
++ *bsd*|linux*|beos|irix*|solaris*|gnu*)
+ if test "$ARCHITECTURE" = "X86_64" ; then
+ AC_MSG_RESULT([elf64])
+ NASM_FORMAT="elf64"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..38aa8a2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+hurd.diff
diff --git a/debian/rules b/debian/rules
index be99485..c838b48 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,3 +9,7 @@ CFLAGS = $(or $(DEB_CFLAGS),$(DEFAULT_CFLAGS))
%:
dh $@ --sourcedirectory=build/generic \
--parallel
+
+override_dh_auto_configure:
+ cd build/generic && autoconf
+ dh_auto_configure
--
xvidcore packaging
More information about the pkg-multimedia-commits
mailing list