[SCM] ffmpeg/master: remove 02-Fix-kfreeBSD-FTBFS.patch, applied upstream

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Tue Jun 14 21:27:55 UTC 2011


The following commit has been merged in the master branch:
commit f2a6d3cae9b5c7ff51c7beb76497f368b0b53dba
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 14 22:03:26 2011 +0200

    remove 02-Fix-kfreeBSD-FTBFS.patch, applied upstream

diff --git a/debian/patches/02-Fix-kfreeBSD-FTBFS.patch b/debian/patches/02-Fix-kfreeBSD-FTBFS.patch
deleted file mode 100644
index c65a10f..0000000
--- a/debian/patches/02-Fix-kfreeBSD-FTBFS.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Reinhard Tartler <siretart at tauware.de>
-Date:   Sat May 14 16:10:30 2011 +0200
-Origin: upstream, c1f54478050279663217fe5ffa4bc90f60e7030d
-
-    configure: use same CPPFLAGS in kFreeBSD as Linux
-    
-    046f081b46c8479820409cf8f530b988221bd15b reorganized the CPPFLAGS to no
-    longer add -D_POSIX_C_SOURCE unconditionally, but only on systems (e.g.,
-    glibc based ones) that require it.  As kFreeBSD uses glibc, it needs to
-    be treated similar.
-    
-    Additionally, _BSD_SOURCE is turned on to enable some additional types
-    such as caddr_t, which are normally enabled on BSD but not with glibc.
-
-	Modified configure
-Index: libav/configure
-===================================================================
---- libav.orig/configure	2011-05-15 10:37:33.002501095 +0200
-+++ libav/configure	2011-05-15 10:39:43.572501066 +0200
-@@ -2488,6 +2488,7 @@
-         enable dos_paths
-         ;;
-     gnu/kfreebsd)
-+        add_cppflags -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
-         ;;
-     gnu)
-         ;;
diff --git a/debian/patches/series b/debian/patches/series
index e2b727d..89693a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01-Tweak-doxygen-config.patch
-02-Fix-kfreeBSD-FTBFS.patch

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list