Commit 3e63b534 authored by Sam Hocevar's avatar Sam Hocevar

* debian/rules:

    + Build ffmpeg with --enable-gpl because the postprocessing code is GPL.
    + Check for .svn directories in addition to CVS.
parent 5b5dd2de
......@@ -87,16 +87,16 @@ configure-stamp:
# Check that we have an ffmpeg tree in here (can be a symlink)
test -d extras/ffmpeg
if test ! -d CVS; then \
if test ! '(' -d CVS -o .svn ')'; then \
cd extras/ffmpeg \
&& CC=$(CC) ./configure --enable-pp --enable-zlib --disable-debug \
&& CC=$(CC) ./configure --enable-pp --enable-gpl --enable-zlib --disable-debug \
&& cd libavcodec \
&& $(MAKE); \
fi
# Check that we have an faad2 tree in here (can be a symlink)
test -d extras/faad2
if test ! -d CVS; then \
if test ! '(' -d CVS -o .svn ')'; then \
cd extras/faad2 \
&& touch `find . -name configure.in` \
&& touch `find . -name aclocal.m4` \
......@@ -125,7 +125,7 @@ build-stamp:
ifneq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386)
# Hackety hackety hack
if test ! -d CVS; then \
if test ! '(' -d CVS -o .svn ')'; then \
cd extras/ffmpeg/libavcodec \
&& $(MAKE) clean \
&& rm -f Makefile.pic \
......@@ -135,7 +135,7 @@ ifneq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386)
fi
# HACKETY HACKETY HACK
if test ! -d CVS; then \
if test ! '(' -d CVS -o .svn ')'; then \
cd extras/faad2/libfaad \
&& $(MAKE) clean \
&& $(MAKE) AM_CFLAGS=-fPIC; \
......@@ -154,10 +154,14 @@ clean:
# Check that we have an ffmpeg tree in here (can be a symlink)
test -d extras/ffmpeg
-if test ! -d CVS; then cd extras/ffmpeg && $(MAKE) distclean; fi
-if test ! '(' -d CVS -o .svn ')'; then \
cd extras/ffmpeg && $(MAKE) distclean; \
fi
# Check that we have an faad2 tree in here (can be a symlink)
test -d extras/faad2
-if test ! -d CVS; then cd extras/faad2 && $(MAKE) distclean; fi
-if test ! '(' -d CVS -o .svn ')'; then \
cd extras/faad2 && $(MAKE) distclean; \
fi
# Removed ugly cruft
rm -f src/misc/modules_builtin.h
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment