[SCM] xvidcore/master: Remove all patches, applied upstream.

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d0ef3739cf36ee621533350340cf70e2b82fda57
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Tue Apr 22 09:36:43 2014 +0200

    Remove all patches, applied upstream.

diff --git a/debian/patches/add-soname-links.patch b/debian/patches/add-soname-links.patch
deleted file mode 100644
index 0441972..0000000
--- a/debian/patches/add-soname-links.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-Description: xvidcore: Adds common symlinks for shared library.
-Author: Andres Mejia <amejia at debian.org>
-Forwarded: http://list.xvid.org/pipermail/xvid-devel/2011-September/006349.html
-
---- a/build/generic/configure.in
-+++ b/build/generic/configure.in
-@@ -144,6 +144,12 @@
- AC_CHECK_TOOL([AR], [ar], [ar-not-found])
- 
- dnl ==========================================================================
-+dnl Check how the system supports symlinks.
-+dnl ==========================================================================
-+
-+AC_PROG_LN_S
-+
-+dnl ==========================================================================
- dnl
- dnl This part looks for:
- dnl
-@@ -280,11 +286,15 @@
- SPECIFIC_CFLAGS=""
- ALTIVEC_CFLAGS=""
- PRE_SHARED_LIB=""
-+SO_API_MAJOR_LINK=""
-+SO_LINK=""
- case "$target_os" in
-      linux*|solaris*|gnu*)
- 	AC_MSG_RESULT([ok])
- 	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
- 	SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)"
-+	SO_API_MAJOR_LINK="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR)"
-+	SO_LINK="libxvidcore.\$(SHARED_EXTENSION)"
- 	SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -Wl,--version-script=libxvidcore.ld -lc -lm"
- 	SPECIFIC_CFLAGS="-fPIC"
- 	;;
-@@ -292,6 +302,8 @@
- 	AC_MSG_RESULT([ok])
- 	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
- 	SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)"
-+	SO_API_MAJOR_LINK="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR)"
-+	SO_LINK="libxvidcore.\$(SHARED_EXTENSION)"
- 	SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -lc -lm"
- 	SPECIFIC_CFLAGS="-fPIC"
- 	;;
-@@ -711,12 +723,15 @@
- AC_SUBST(SPECIFIC_CFLAGS)
- AC_SUBST(DCT_IA64_SOURCES)
- AC_SUBST(PPC_ALTIVEC_SOURCES)
-+AC_SUBST(LN_S)
- AC_SUBST(RANLIB)
- AC_SUBST(AR)
- AC_SUBST(API_MAJOR)
- AC_SUBST(API_MINOR)
- AC_SUBST(STATIC_LIB)
- AC_SUBST(PRE_SHARED_LIB)
-+AC_SUBST(SO_API_MAJOR_LINK)
-+AC_SUBST(SO_LINK)
- AC_SUBST(SHARED_LIB)
- AC_SUBST(ALTIVEC_CFLAGS)
- 
---- a/build/generic/platform.inc.in
-+++ b/build/generic/platform.inc.in
-@@ -57,6 +57,7 @@
- # ============================================================================
- 
- INSTALL=@INSTALL@
-+LN_S=@LN_S@
- DESTDIR=
- prefix=@prefix@
- exec_prefix=@exec_prefix@
-@@ -79,3 +80,5 @@
- STATIC_LIB=@STATIC_LIB@
- SHARED_LIB=@SHARED_LIB@
- PRE_SHARED_LIB=@PRE_SHARED_LIB@
-+SO_API_MAJOR_LINK=@SO_API_MAJOR_LINK@
-+SO_LINK=@SO_LINK@
---- a/build/generic/Makefile
-+++ b/build/generic/Makefile
-@@ -145,6 +145,10 @@
- 	@$(INSTALL) -d $(DESTDIR)$(libdir)
- 	@echo "  I: $(libdir)/$(SHARED_LIB)"
- 	@$(INSTALL) -m 644 $(BUILD_DIR)/$(SHARED_LIB) $(DESTDIR)$(libdir)/$(SHARED_LIB)
-+	@test -z "$(SO_API_MAJOR_LINK)" || \
-+		$(LN_S) $(SHARED_LIB) $(DESTDIR)$(libdir)/$(SO_API_MAJOR_LINK)
-+	@test -z "$(SO_LINK)" || \
-+		$(LN_S) $(SHARED_LIB) $(DESTDIR)$(libdir)/$(SO_LINK)
- 	@echo "  I: $(libdir)/$(STATIC_LIB)"
- 	@$(INSTALL) -m 644 $(BUILD_DIR)/$(STATIC_LIB) $(DESTDIR)$(libdir)/$(STATIC_LIB)
- 	@echo "  D: $(includedir)"
diff --git a/debian/patches/hurd.diff b/debian/patches/hurd.diff
deleted file mode 100644
index 8630d3f..0000000
--- a/debian/patches/hurd.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-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
deleted file mode 100644
index 901b0e0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-hurd.diff
-add-soname-links.patch

-- 
xvidcore packaging