]> git.sesse.net Git - vlc/blobdiff - debian/rules
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
* Backport of SSA/ASS fixes [11158] to 0.8.2
[vlc] / debian / rules
diff --git a/debian/rules b/debian/rules
index 3f38f4deff5bd42278d9cf5778e8e2864c8f27e0..306745d3cc04de78b34d32abe3cb3cde4d464977 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,14 +13,14 @@ include /usr/share/dpatch/dpatch.make
 
 CONFIG_FLAGS = --enable-release --prefix=/usr
 CONFIG_FLAGS += \
-       --enable-gnome \
-       --enable-gtk \
+       --disable-gnome \
+       --disable-gtk \
        --disable-familiar \
        --disable-fb \
        --enable-ggi \
        --enable-sdl \
        --enable-esd \
-       --enable-qt \
+       --disable-qt \
        --enable-mad \
        --enable-arts \
        --enable-alsa \
@@ -30,14 +30,15 @@ CONFIG_FLAGS += \
        --enable-dvbpsi \
        --enable-xosd \
        --enable-mozilla \
-       --enable-kde \
+       --disable-kde \
        --enable-mp4 \
-       --disable-dvb \
+       --enable-dvb \
        --enable-dv \
        --disable-satellite \
        --enable-ogg \
        --enable-vorbis \
        --enable-wxwindows \
+       --with-wx-config=wxgtk-2.4-config \
        --disable-slp \
        --enable-flac \
        --disable-skins \
@@ -47,7 +48,7 @@ CONFIG_FLAGS += \
        --enable-mkv \
        --enable-v4l \
        --enable-pvr \
-       --enable-speex \
+       --disable-speex \
        --enable-caca \
        --enable-livedotcom \
        --enable-libmpeg2 \
@@ -57,11 +58,13 @@ CONFIG_FLAGS += \
        --enable-mod \
        --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
 
@@ -94,15 +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 \
-         && cd libavcodec \
-         && $(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 \
@@ -139,16 +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; \
-       fi
-
        # Hackety hackety hack
        if test ! '(' -d CVS -o -d .svn ')'; then \
          cd extras/x264 \
@@ -176,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 \
@@ -232,32 +211,32 @@ install: build
        ln -s vlc debian/libvlc0-dev/usr/share/doc/libvlc0-dev
 
        # Package: gnome-vlc
-       mv debian/vlc/usr/bin/gnome-vlc debian/gnome-vlc/usr/bin/
+       #mv debian/vlc/usr/bin/gnome-vlc debian/gnome-vlc/usr/bin/
        ln -s vlc debian/gnome-vlc/usr/share/doc/gnome-vlc
-       mv debian/vlc/usr/lib/vlc/misc/libgnome_main_plugin.so \
-         debian/gnome-vlc/usr/lib/vlc/gui/
-       mv debian/vlc/usr/lib/vlc/gui/libgnome_plugin.so \
-         debian/gnome-vlc/usr/lib/vlc/gui/
-       ln -s vlc.1.gz debian/gnome-vlc/usr/share/man/man1/gnome-vlc.1.gz
-       mv debian/vlc/$(VIDDIR)/gnome-vlc32x32.xpm debian/gnome-vlc/$(VIDDIR)/gnome-vlc.xpm
-       mv debian/vlc/$(VIDDIR)/gnome-vlc48x48.png debian/gnome-vlc/$(PIXDIR)/gnome-vlc.png
+       #mv debian/vlc/usr/lib/vlc/misc/libgnome_main_plugin.so \
+       #  debian/gnome-vlc/usr/lib/vlc/gui/
+       #mv debian/vlc/usr/lib/vlc/gui/libgnome_plugin.so \
+       #  debian/gnome-vlc/usr/lib/vlc/gui/
+       #ln -s vlc.1.gz debian/gnome-vlc/usr/share/man/man1/gnome-vlc.1.gz
+       #mv debian/vlc/$(VIDDIR)/gnome-vlc32x32.xpm debian/gnome-vlc/$(VIDDIR)/gnome-vlc.xpm
+       #mv debian/vlc/$(VIDDIR)/gnome-vlc48x48.png debian/gnome-vlc/$(PIXDIR)/gnome-vlc.png
 
        # Package: vlc-gnome
        mkdir -p debian/vlc-gnome/usr/share/doc/
        ln -s vlc debian/vlc-gnome/usr/share/doc/vlc-gnome
 
        # Package: gvlc
-       mv debian/vlc/usr/bin/gvlc debian/gvlc/usr/bin/
+       #mv debian/vlc/usr/bin/gvlc debian/gvlc/usr/bin/
        ln -s vlc debian/gvlc/usr/share/doc/gvlc
-       mv debian/vlc/usr/lib/vlc/misc/libgtk_main_plugin.so \
-         debian/gvlc/usr/lib/vlc/gui/
-       mv debian/vlc/usr/lib/vlc/gui/libgtk_plugin.so \
-         debian/gvlc/usr/lib/vlc/gui/
+       #mv debian/vlc/usr/lib/vlc/misc/libgtk_main_plugin.so \
+       #  debian/gvlc/usr/lib/vlc/gui/
+       #mv debian/vlc/usr/lib/vlc/gui/libgtk_plugin.so \
+       #  debian/gvlc/usr/lib/vlc/gui/
        #mv debian/vlc/usr/lib/vlc/gui/libfamiliar_plugin.so \
        #  debian/gvlc/usr/lib/vlc/gui/
-       ln -s vlc.1.gz debian/gvlc/usr/share/man/man1/gvlc.1.gz
-       mv debian/vlc/$(VIDDIR)/gvlc32x32.xpm debian/gvlc/$(VIDDIR)/gvlc.xpm
-       mv debian/vlc/$(VIDDIR)/gvlc48x48.png debian/gvlc/$(PIXDIR)/gvlc.png
+       #ln -s vlc.1.gz debian/gvlc/usr/share/man/man1/gvlc.1.gz
+       #mv debian/vlc/$(VIDDIR)/gvlc32x32.xpm debian/gvlc/$(VIDDIR)/gvlc.xpm
+       #mv debian/vlc/$(VIDDIR)/gvlc48x48.png debian/gvlc/$(PIXDIR)/gvlc.png
 
        # Package: vlc-gtk
        mkdir -p debian/vlc-gtk/usr/share/doc/
@@ -313,13 +292,13 @@ ifeq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386)
 endif
 
        # Package: qvlc
-       mv debian/vlc/usr/bin/qvlc debian/qvlc/usr/bin/
+       #mv debian/vlc/usr/bin/qvlc debian/qvlc/usr/bin/
        ln -s vlc debian/qvlc/usr/share/doc/qvlc
-       mv debian/vlc/usr/lib/vlc/gui/libqt_plugin.so \
-         debian/qvlc/usr/lib/vlc/gui/
-       ln -s vlc.1.gz debian/qvlc/usr/share/man/man1/qvlc.1.gz
-       mv debian/vlc/$(VIDDIR)/qvlc32x32.xpm debian/qvlc/$(VIDDIR)/qvlc.xpm
-       mv debian/vlc/$(VIDDIR)/qvlc48x48.png debian/qvlc/$(PIXDIR)/qvlc.png
+       #mv debian/vlc/usr/lib/vlc/gui/libqt_plugin.so \
+       #  debian/qvlc/usr/lib/vlc/gui/
+       #ln -s vlc.1.gz debian/qvlc/usr/share/man/man1/qvlc.1.gz
+       #mv debian/vlc/$(VIDDIR)/qvlc32x32.xpm debian/qvlc/$(VIDDIR)/qvlc.xpm
+       #mv debian/vlc/$(VIDDIR)/qvlc48x48.png debian/qvlc/$(PIXDIR)/qvlc.png
 
        # Package: vlc-qt
        mkdir -p debian/vlc-qt/usr/share/doc/
@@ -340,14 +319,14 @@ endif
        ln -s ../../mozilla/components/vlcintf.xpt debian/mozilla-plugin-vlc/usr/lib/mozilla-firefox/components/
 
        # Package: kvlc
-       mv debian/vlc/usr/bin/kvlc debian/kvlc/usr/bin/
+       #mv debian/vlc/usr/bin/kvlc debian/kvlc/usr/bin/
        ln -s vlc debian/kvlc/usr/share/doc/kvlc
-       mv debian/vlc/usr/lib/vlc/gui/libkde_plugin.so \
-         debian/kvlc/usr/lib/vlc/gui/
-       mv debian/vlc/$(VIDDIR)/ui.rc debian/kvlc/$(VIDDIR)
-       ln -s vlc.1.gz debian/kvlc/usr/share/man/man1/kvlc.1.gz
-       mv debian/vlc/$(VIDDIR)/kvlc32x32.xpm debian/kvlc/$(VIDDIR)/kvlc.xpm
-       mv debian/vlc/$(VIDDIR)/kvlc48x48.png debian/kvlc/$(PIXDIR)/kvlc.png
+       #mv debian/vlc/usr/lib/vlc/gui/libkde_plugin.so \
+       #  debian/kvlc/usr/lib/vlc/gui/
+       #mv debian/vlc/$(VIDDIR)/ui.rc debian/kvlc/$(VIDDIR)
+       #ln -s vlc.1.gz debian/kvlc/usr/share/man/man1/kvlc.1.gz
+       #mv debian/vlc/$(VIDDIR)/kvlc32x32.xpm debian/kvlc/$(VIDDIR)/kvlc.xpm
+       #mv debian/vlc/$(VIDDIR)/kvlc48x48.png debian/kvlc/$(PIXDIR)/kvlc.png
 
        # Package: vlc-plugin-svgalib
 ifeq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386)
Unnamed repository; edit this file 'description' to name the repository.