r20 - unstable/ffmpeg/debian
Sam Hocevar
sho at alioth.debian.org
Wed Mar 14 14:19:04 CET 2007
Author: sho
Date: 2006-04-09 16:00:41 +0000 (Sun, 09 Apr 2006)
New Revision: 20
Modified:
unstable/ffmpeg/debian/changelog
unstable/ffmpeg/debian/control
unstable/ffmpeg/debian/libavcodec-dev.install
unstable/ffmpeg/debian/libavformat-dev.install
unstable/ffmpeg/debian/rules
Log:
ffmpeg (0.cvs20060329-4) unstable; urgency=low
* debian/control:
+ Make each -dev package depend on the corresponding shared library
package (Closes: #361348).
+ Moved libavutil files from libavformat-dev to libavcodec-dev which is
the real common dependency (Closes: #361269).
Modified: unstable/ffmpeg/debian/changelog
===================================================================
--- unstable/ffmpeg/debian/changelog 2006-04-06 15:55:32 UTC (rev 19)
+++ unstable/ffmpeg/debian/changelog 2006-04-09 16:00:41 UTC (rev 20)
@@ -1,3 +1,21 @@
+ffmpeg (0.cvs20060329-4) unstable; urgency=low
+
+ * debian/control:
+ + Make each -dev package depend on the corresponding shared library
+ package (Closes: #361348).
+ + Moved libavutil files from libavformat-dev to libavcodec-dev which is
+ the real common dependency (Closes: #361269).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 9 Apr 2006 15:23:37 +0200
+
+ffmpeg (0.cvs20060329-3) unstable; urgency=low
+
+ * debian/rules: that build system is hopeless. We now run configure and
+ make twice, backup static libraries inbetween, then update timestamps
+ to fool make. That should fix the FTBFS (Closes: #361215).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Fri, 7 Apr 2006 11:33:15 +0200
+
ffmpeg (0.cvs20060329-2) unstable; urgency=low
* debian/rules: fixed Makefile.pic generation.
Modified: unstable/ffmpeg/debian/control
===================================================================
--- unstable/ffmpeg/debian/control 2006-04-06 15:55:32 UTC (rev 19)
+++ unstable/ffmpeg/debian/control 2006-04-09 16:00:41 UTC (rev 20)
@@ -50,7 +50,9 @@
Package: libavcodec-dev
Section: libdevel
Architecture: any
-Depends: libvorbis-dev, libogg-dev, libdts-dev, liba52-dev, zlib1g-dev, libraw1394-dev, libdc1394-13-dev, libtheora-dev (>> 0.0.0.alpha4), libgsm1-dev, ${shlibs:Depends}
+Depends: libavcodec0d (= ${Source-Version}), libvorbis-dev, libogg-dev, libdts-dev, liba52-dev, zlib1g-dev, libraw1394-dev, libdc1394-13-dev, libtheora-dev (>> 0.0.0.alpha4), libgsm1-dev, ${shlibs:Depends}
+Conflicts: libavformat-dev (<< 0.cvs20060329-4)
+Replaces: libavformat-dev (<< 0.cvs20060329-4)
Description: development files for libavcodec
This is the codec library from the ffmpeg project. It supports most existing
encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
@@ -61,7 +63,7 @@
Package: libpostproc-dev
Section: libdevel
Architecture: any
-Depends: libavcodec-dev (= ${Source-Version}), ${shlibs:Depends}
+Depends: libpostproc0d (= ${Source-Version}), libavcodec-dev (= ${Source-Version}), ${shlibs:Depends}
Description: development files for libpostproc
This is the video postprocessing library from the ffmpeg project.
.
@@ -71,7 +73,7 @@
Package: libavformat-dev
Section: libdevel
Architecture: any
-Depends: libavcodec-dev (= ${Source-Version}), ${shlibs:Depends}
+Depends: libavformat0d (= ${Source-Version}), libavcodec-dev (= ${Source-Version}), ${shlibs:Depends}
Conflicts: libavcodec-dev (<< 0.cvs20060306-1)
Replaces: libavcodec-dev (<< 0.cvs20060306-1)
Description: development files for libavformat
Modified: unstable/ffmpeg/debian/libavcodec-dev.install
===================================================================
--- unstable/ffmpeg/debian/libavcodec-dev.install 2006-04-06 15:55:32 UTC (rev 19)
+++ unstable/ffmpeg/debian/libavcodec-dev.install 2006-04-09 16:00:41 UTC (rev 20)
@@ -1,3 +1,14 @@
+usr/bin/ffmpeg-config
+usr/share/man/man1/ffmpeg-config.1
+usr/lib/pkgconfig/libavutil.pc
+usr/include/ffmpeg/avutil.h
+usr/include/ffmpeg/common.h
+usr/include/ffmpeg/mathematics.h
+usr/include/ffmpeg/rational.h
+usr/include/ffmpeg/integer.h
+usr/include/ffmpeg/intfloat_readwrite.h
+usr/lib/libavutil.a
+usr/lib/libavutil.so
usr/lib/pkgconfig/libavcodec.pc
usr/include/ffmpeg/avcodec.h
usr/include/ffmpeg/dsputil.h
Modified: unstable/ffmpeg/debian/libavformat-dev.install
===================================================================
--- unstable/ffmpeg/debian/libavformat-dev.install 2006-04-06 15:55:32 UTC (rev 19)
+++ unstable/ffmpeg/debian/libavformat-dev.install 2006-04-09 16:00:41 UTC (rev 20)
@@ -1,14 +1,3 @@
-usr/bin/ffmpeg-config
-usr/share/man/man1/ffmpeg-config.1
-usr/lib/pkgconfig/libavutil.pc
-usr/include/ffmpeg/avutil.h
-usr/include/ffmpeg/common.h
-usr/include/ffmpeg/mathematics.h
-usr/include/ffmpeg/rational.h
-usr/include/ffmpeg/integer.h
-usr/include/ffmpeg/intfloat_readwrite.h
-usr/lib/libavutil.a
-usr/lib/libavutil.so
usr/lib/pkgconfig/libavformat.pc
usr/include/ffmpeg/avformat.h
usr/include/ffmpeg/avio.h
Modified: unstable/ffmpeg/debian/rules
===================================================================
--- unstable/ffmpeg/debian/rules 2006-04-06 15:55:32 UTC (rev 19)
+++ unstable/ffmpeg/debian/rules 2006-04-09 16:00:41 UTC (rev 20)
@@ -11,7 +11,7 @@
# confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
#endif
-confflags += --enable-shared --enable-gpl --enable-pp --enable-pthreads
+confflags += --enable-gpl --enable-pp --enable-pthreads
confflags += --enable-vorbis --enable-libogg --enable-theora --enable-a52 --enable-dts --enable-dc1394 --enable-libgsm
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
confflags += --enable-debug
@@ -38,59 +38,68 @@
$(warning Make sure these packages are installed: $(weak-build-deps))
endif
-configure: configure-stamp
-configure-stamp:
+build: build-stamp
+build-stamp:
dh_testdir
QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+
+ # Build ffmpeg and static libraries
./configure $(confflags) --prefix=/usr
- touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp:
- dh_testdir
cd doc && $(MAKE)
+ $(MAKE)
+ # Backup static libraries
+ mv libavutil/libavutil.a libavutil/libavutil.a.bak
+ mv libavcodec/libpostproc/libpostproc.a libavcodec/libpostproc/libpostproc.a.bak
+ mv libavcodec/libavcodec.a libavcodec/libavcodec.a.bak
+ mv libavformat/libavformat.a libavformat/libavformat.a.bak
+
+ # Build shared libraries
+ ./configure $(confflags) --enable-shared --prefix=/usr
+
+ sed 's/ldts/ldts_pic/' <config.mak >config.mak.pic
+
cd libavutil && \
+ $(MAKE) clean && \
rm -f Makefile.pic && \
- sed 's/^CFLAGS *=/&-fPIC -DPIC /' <Makefile >Makefile.pic && \
+ sed 's/^CFLAGS *=/&-fPIC -DPIC /; s/config.mak/config.mak.pic/' <Makefile >Makefile.pic && \
$(MAKE) -f Makefile.pic && \
- mv libavutil.so libavutil.so.bak && \
- $(MAKE) clean && \
rm -f Makefile.pic
cd libavcodec && \
- rm -f Makefile.pic ../config.mak.pic && \
+ $(MAKE) clean && \
+ rm -f Makefile.pic && \
sed 's/^CFLAGS *=/&-fPIC -DPIC /; s/config.mak/config.mak.pic/' <Makefile >Makefile.pic && \
- sed 's/^ldts/ldts_pic/' <../config.mak >../config.mak.pic && \
- echo 'EXTRALIBS += -ldts_pic' >> Makefile.pic && \
$(MAKE) -f Makefile.pic && \
- mv libavcodec.so libavcodec.so.bak && \
- $(MAKE) clean && \
- rm -f Makefile.pic ../config.mak.pic
+ rm -f Makefile.pic
cd libavcodec/libpostproc && \
+ $(MAKE) clean && \
rm -f Makefile.pic && \
- sed 's/^CFLAGS *=/&-fPIC -DPIC /' <Makefile >Makefile.pic && \
+ sed 's/^CFLAGS *=/&-fPIC -DPIC /; s/config.mak/config.mak.pic/' <Makefile >Makefile.pic && \
$(MAKE) -f Makefile.pic && \
- mv libpostproc.so libpostproc.so.bak && \
- $(MAKE) clean && \
rm -f Makefile.pic
cd libavformat && \
+ $(MAKE) clean && \
rm -f Makefile.pic && \
- sed 's/^CFLAGS *=/&-fPIC -DPIC /' <Makefile >Makefile.pic && \
+ sed 's/^CFLAGS *=/&-fPIC -DPIC /; s/config.mak/config.mak.pic/' <Makefile >Makefile.pic && \
$(MAKE) -f Makefile.pic && \
- mv libavformat.so libavformat.so.bak && \
- $(MAKE) clean && \
rm -f Makefile.pic
- $(MAKE)
+ rm -f config.mak.pic
- cat libavutil/libavutil.so.bak > libavutil/libavutil.so
- cat libavcodec/libavcodec.so.bak > libavcodec/libavcodec.so
- cat libavcodec/libpostproc/libpostproc.so.bak > libavcodec/libpostproc/libpostproc.so
- cat libavformat/libavformat.so.bak > libavformat/libavformat.so
+ # Restore static libraries
+ mv libavutil/libavutil.a.bak libavutil/libavutil.a
+ mv libavcodec/libpostproc/libpostproc.a.bak libavcodec/libpostproc/libpostproc.a
+ mv libavcodec/libavcodec.a.bak libavcodec/libavcodec.a
+ mv libavformat/libavformat.a.bak libavformat/libavformat.a
+ # Fix timestamps
+ touch libavutil/libavutil.a libavcodec/libpostproc/libpostproc.a
+ touch libavcodec/libavcodec.a libavformat/libavformat.a
+ touch ffmpeg ffmpeg_g ffplay ffplay_g
+
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-cd tests && $(MAKE)
endif
@@ -100,17 +109,17 @@
clean:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
+ rm -f build-stamp
-cd doc && $(MAKE) clean
-cd tests && $(MAKE) clean
-$(MAKE) distclean
QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
rm -f libavutil/Makefile.pic libavformat/Makefile.pic config.log
rm -f libavcodec/libpostproc/Makefile.pic libavformat/Makefile.pic
- rm -f libavutil/libavutil.so.bak
- rm -f libavcodec/libavcodec.so.bak
- rm -f libavcodec/libpostproc/libpostproc.so.bak
- rm -f libavformat/libavformat.so.bak
+ rm -f libavutil/libavutil.a.bak
+ rm -f libavcodec/libpostproc/libpostproc.a.bak
+ rm -f libavcodec/libavcodec.a.bak
+ rm -f libavformat/libavformat.a.bak
rm -f libavcodec-uninstalled.pc libavcodec.pc
rm -f libavutil-uninstalled.pc libavutil.pc
rm -f libavformat-uninstalled.pc libavformat.pc
@@ -129,6 +138,8 @@
cp libavcodec/libpostproc/postprocess.h debian/tmp/usr/include/postproc
cp libpostproc.pc debian/tmp/usr/lib/pkgconfig/
+ dh_install -ptmp libavutil/libavutil.so* libavcodec/libavcodec.so* libavcodec/libpostproc/libpostproc.so* libavformat/libavformat.so* /usr/lib
+
cp doc/*.html debian/tmp/usr/share/doc/ffmpeg/html/
cp doc/ffserver.conf debian/tmp/etc/
@@ -175,4 +186,4 @@
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install
More information about the Pkg-multimedia-commits
mailing list