r1447 - in /unstable/ffmpeg-debian/debian: confflags libavcodec-dev.install libavdevice-dev.install libavformat-dev.install libavutil-dev.install libpostproc-dev.install libswscale-dev.install patches/series rules

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Tue Sep 9 07:17:32 UTC 2008 

Author: siretart
Date: Tue Sep  9 07:17:32 2008
New Revision: 1447

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1447
Log:
unbreak package build, a lot of includes are installed at other locations now. also remove most of our patches, since they are not necessary anymore

Modified:
    unstable/ffmpeg-debian/debian/confflags
    unstable/ffmpeg-debian/debian/libavcodec-dev.install
    unstable/ffmpeg-debian/debian/libavdevice-dev.install
    unstable/ffmpeg-debian/debian/libavformat-dev.install
    unstable/ffmpeg-debian/debian/libavutil-dev.install
    unstable/ffmpeg-debian/debian/libpostproc-dev.install
    unstable/ffmpeg-debian/debian/libswscale-dev.install
    unstable/ffmpeg-debian/debian/patches/series
    unstable/ffmpeg-debian/debian/rules

Modified: unstable/ffmpeg-debian/debian/confflags
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg-debian/debian/confflags?rev=1447&op=diff
==============================================================================
--- unstable/ffmpeg-debian/debian/confflags (original)
+++ unstable/ffmpeg-debian/debian/confflags Tue Sep  9 07:17:32 2008
@@ -21,8 +21,8 @@
 # Configuration flags causing the libs to be GPL tainted
 gpl_confflags += --enable-gpl
 gpl_confflags += --enable-libfaad
-gpl_confflags += --enable-pp
-gpl_confflags += --enable-swscaler
+gpl_confflags += --enable-postproc
+gpl_confflags += --enable-swscale
 gpl_confflags += --enable-x11grab
 
 # Common configuration flags; comment out following line for LGPL versions of
@@ -33,7 +33,7 @@
 confflags += --enable-libtheora
 confflags += --enable-libvorbis
 confflags += --enable-pthreads
-confflags += --disable-strip
+confflags += --disable-stripping
 
 # Enable IEEE 1394 (FireWire) support on Linux only
 ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))

Modified: unstable/ffmpeg-debian/debian/libavcodec-dev.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg-debian/debian/libavcodec-dev.install?rev=1447&op=diff
==============================================================================
--- unstable/ffmpeg-debian/debian/libavcodec-dev.install (original)
+++ unstable/ffmpeg-debian/debian/libavcodec-dev.install Tue Sep  9 07:17:32 2008
@@ -1,5 +1,6 @@
 usr/lib/pkgconfig/libavcodec.pc
-usr/include/ffmpeg/avcodec.h
-usr/include/ffmpeg/dsputil.h
+usr/include/libavcodec/avcodec.h
+usr/include/libavcodec/dsputil.h
+usr/include/libavcodec/opt.h
 usr/lib/libavcodec.a
 usr/lib/{,*/,*/*/}libavcodec.so

Modified: unstable/ffmpeg-debian/debian/libavdevice-dev.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg-debian/debian/libavdevice-dev.install?rev=1447&op=diff
==============================================================================
--- unstable/ffmpeg-debian/debian/libavdevice-dev.install (original)
+++ unstable/ffmpeg-debian/debian/libavdevice-dev.install Tue Sep  9 07:17:32 2008
@@ -1,4 +1,4 @@
 usr/lib/pkgconfig/libavdevice.pc
-usr/include/ffmpeg/avdevice.h
+usr/include/libavdevice/avdevice.h
 usr/lib/libavdevice.a
 usr/lib/{,*/,*/*/}libavdevice.so

Modified: unstable/ffmpeg-debian/debian/libavformat-dev.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg-debian/debian/libavformat-dev.install?rev=1447&op=diff
==============================================================================
--- unstable/ffmpeg-debian/debian/libavformat-dev.install (original)
+++ unstable/ffmpeg-debian/debian/libavformat-dev.install Tue Sep  9 07:17:32 2008
@@ -1,7 +1,7 @@
 usr/lib/pkgconfig/libavformat.pc
-usr/include/ffmpeg/avformat.h
-usr/include/ffmpeg/avio.h
-usr/include/ffmpeg/rtsp.h
-usr/include/ffmpeg/rtspcodes.h
+usr/include/libavformat/avformat.h
+usr/include/libavformat/avio.h
+usr/include/libavformat/rtsp.h
+usr/include/libavformat/rtspcodes.h
 usr/lib/libavformat.a
 usr/lib/{,*/,*/*/}libavformat.so

Modified: unstable/ffmpeg-debian/debian/libavutil-dev.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg-debian/debian/libavutil-dev.install?rev=1447&op=diff
==============================================================================
--- unstable/ffmpeg-debian/debian/libavutil-dev.install (original)
+++ unstable/ffmpeg-debian/debian/libavutil-dev.install Tue Sep  9 07:17:32 2008
@@ -1,20 +1,19 @@
 usr/lib/pkgconfig/libavutil.pc
-usr/include/ffmpeg/adler32.h
-usr/include/ffmpeg/avstring.h
-usr/include/ffmpeg/avutil.h
-usr/include/ffmpeg/base64.h
-usr/include/ffmpeg/common.h
-usr/include/ffmpeg/crc.h
-usr/include/ffmpeg/fifo.h
-usr/include/ffmpeg/intfloat_readwrite.h
-usr/include/ffmpeg/log.h
-usr/include/ffmpeg/lzo.h
-usr/include/ffmpeg/mathematics.h
-usr/include/ffmpeg/md5.h
-usr/include/ffmpeg/mem.h
-usr/include/ffmpeg/opt.h
-usr/include/ffmpeg/random.h
-usr/include/ffmpeg/rational.h
-usr/include/ffmpeg/sha1.h
+usr/include/libavutil/adler32.h
+usr/include/libavutil/avstring.h
+usr/include/libavutil/avutil.h
+usr/include/libavutil/base64.h
+usr/include/libavutil/common.h
+usr/include/libavutil/crc.h
+usr/include/libavutil/fifo.h
+usr/include/libavutil/intfloat_readwrite.h
+usr/include/libavutil/log.h
+usr/include/libavutil/lzo.h
+usr/include/libavutil/mathematics.h
+usr/include/libavutil/md5.h
+usr/include/libavutil/mem.h
+usr/include/libavutil/random.h
+usr/include/libavutil/rational.h
+usr/include/libavutil/sha1.h
 usr/lib/libavutil.a
 usr/lib/{,*/,*/*/}libavutil.so

Modified: unstable/ffmpeg-debian/debian/libpostproc-dev.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg-debian/debian/libpostproc-dev.install?rev=1447&op=diff
==============================================================================
--- unstable/ffmpeg-debian/debian/libpostproc-dev.install (original)
+++ unstable/ffmpeg-debian/debian/libpostproc-dev.install Tue Sep  9 07:17:32 2008
@@ -1,4 +1,4 @@
 usr/lib/pkgconfig/libpostproc.pc
-usr/include/postproc/postprocess.h
+usr/include/libpostproc/postprocess.h
 usr/lib/libpostproc.a
 usr/lib/{,*/,*/*/}libpostproc.so

Modified: unstable/ffmpeg-debian/debian/libswscale-dev.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg-debian/debian/libswscale-dev.install?rev=1447&op=diff
==============================================================================
--- unstable/ffmpeg-debian/debian/libswscale-dev.install (original)
+++ unstable/ffmpeg-debian/debian/libswscale-dev.install Tue Sep  9 07:17:32 2008
@@ -1,5 +1,5 @@
 usr/lib/pkgconfig/libswscale.pc
-usr/include/ffmpeg/swscale.h
-usr/include/ffmpeg/rgb2rgb.h
+usr/include/libswscale/swscale.h
+usr/include/libswscale/rgb2rgb.h
 usr/lib/libswscale.a
 usr/lib/{,*/,*/*/}libswscale.so

Modified: unstable/ffmpeg-debian/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg-debian/debian/patches/series?rev=1447&op=diff
==============================================================================
--- unstable/ffmpeg-debian/debian/patches/series (original)
+++ unstable/ffmpeg-debian/debian/patches/series Tue Sep  9 07:17:32 2008
@@ -1,10 +1,3 @@
 001_fixup_version.diff
-010_fix_ftbfs_hppa.diff
-10_fix_kfreebsd_libx11_linkage.diff
-010_proper_rpath.diff
-013_strip_unneeded_linker_flags.diff
-015_reenable-img_convert.diff
-020_fix_libswscale_pic_code
-020_bug489965_bufferoverflow_str_demuxer.diff
-300_c++_compliant_headers.diff
+#015_reenable-img_convert.diff
 900_doxyfile

Modified: unstable/ffmpeg-debian/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg-debian/debian/rules?rev=1447&op=diff
==============================================================================
--- unstable/ffmpeg-debian/debian/rules (original)
+++ unstable/ffmpeg-debian/debian/rules Tue Sep  9 07:17:32 2008
@@ -82,7 +82,7 @@
 	dh_installdirs -ptmp usr/share/doc/ffmpeg/html etc
 	dh_installdirs -ptmp usr/share/doc/ffmpeg-doc/html
 	$(foreach flavor,$(FLAVORS),$(call install_flavor,$(flavor)))
-	cp -a libavcodec/dsputil.h debian/tmp/usr/include/ffmpeg
+	cp -a libavcodec/dsputil.h debian/tmp/usr/include/libavcodec
 	cp debian-shared/doc/*.html debian/tmp/usr/share/doc/ffmpeg/html/
 	# don't fail on binary-indep only builds.
 	[ ! -d doxy ] || cp doxy/html/* debian/tmp/usr/share/doc/ffmpeg-doc/html

More information about the pkg-multimedia-commits mailing list