X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=debian%2Frules;h=306745d3cc04de78b34d32abe3cb3cde4d464977;hb=a543b42419e4fc205db95a4ba2565a4684d85e0c;hp=2ea7981826bd8ed33d5d4c88f7e132ef944a67bb;hpb=9d18bb6bb42d9bae29633b8fd44a8530964c8007;p=vlc

diff --git a/debian/rules b/debian/rules
index 2ea7981826..306745d3cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,7 @@ CONFIG_FLAGS += \
 	--enable-ogg \
 	--enable-vorbis \
 	--enable-wxwindows \
+	--with-wx-config=wxgtk-2.4-config \
 	--disable-slp \
 	--enable-flac \
 	--disable-skins \
@@ -58,11 +59,12 @@ CONFIG_FLAGS += \
 	--enable-theora \
 	--enable-modplug \
 	--enable-dvdnav \
+	--enable-gnutls \
+	--enable-ffmpeg \
+	--enable-ncurses \
 	$(NULL)
 
 # These ones are currently shipped with VLC
-CONFIG_FLAGS += --enable-ffmpeg --with-ffmpeg-tree=extras/ffmpeg
-#CONFIG_FLAGS += --enable-ffmpegaltivec
 CONFIG_FLAGS += --enable-faad --with-faad-tree=extras/faad2
 CONFIG_FLAGS += --enable-x264 --with-x264-tree=extras/x264
 
@@ -95,17 +97,6 @@ configure-stamp:
 	touch config.h.in
 	touch `find . -name Makefile.in`
 
-	# Check that we have an ffmpeg tree in here (can be a symlink)
-	test -d extras/ffmpeg
-	if test ! '(' -d CVS -o -d .svn ')'; then \
-	  cd extras/ffmpeg \
-	  && CC=$(CC) ./configure --enable-pp --enable-gpl --enable-zlib --disable-debug --disable-mmx --disable-altivec \
-	  && cd libavcodec \
-	  && $(MAKE) \
-	  && cd ../libavformat \
-	  && $(MAKE); \
-	fi
-
 	# Check that we have an x264 tree in here (can be a symlink)
 	test -d extras/x264
 	if test ! '(' -d CVS -o -d .svn ')'; then \
@@ -142,22 +133,6 @@ build-stamp: patch configure-stamp
 	cd modules && AM_MAKEFLAGS='plugin=no pic=no' $(MAKE)
 	$(MAKE) vlc
 
-	# Hackety hackety hack
-	if test ! '(' -d CVS -o -d .svn ')'; then \
-	  cd extras/ffmpeg/libavcodec \
-	  && $(MAKE) clean \
-	  && rm -f Makefile.pic \
-	  && sed 's/^CFLAGS *=/&-fPIC -DPIC /' <Makefile >Makefile.pic \
-	  && $(MAKE) -f Makefile.pic \
-	  && rm -f Makefile.pic \
-	  && cd ../libavformat \
-	  && $(MAKE) clean \
-	  && rm -f Makefile.pic \
-	  && sed 's/^CFLAGS *=/&-fPIC -DPIC /' <Makefile >Makefile.pic \
-	  && $(MAKE) -f Makefile.pic \
-	  && rm -f Makefile.pic; \
-	fi
-
 	# Hackety hackety hack
 	if test ! '(' -d CVS -o -d .svn ')'; then \
 	  cd extras/x264 \
@@ -185,11 +160,6 @@ clean: unpatch
 	dh_testroot
 	rm -f configure-stamp build-stamp
 
-	# Check that we have an ffmpeg tree in here (can be a symlink)
-	test -d extras/ffmpeg
-	-if test ! '(' -d CVS -o -d .svn ')'; then \
-	  cd extras/ffmpeg && $(MAKE) distclean; \
-	fi
 	# Check that we have an x264 tree in here (can be a symlink)
 	test -d extras/x264
 	-if test ! '(' -d CVS -o -d .svn ')'; then \