X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=debian%2Frules;h=306745d3cc04de78b34d32abe3cb3cde4d464977;hb=0c0e9c95149f70b30be512fb9ede448c453012eb;hp=fe67feb4b8844f2a626c39deea1a84b2c23f6fe7;hpb=84d63bc713e8b94ebd04f8b4dcfa93395f5bdfa2;p=vlc diff --git a/debian/rules b/debian/rules index fe67feb4b8..306745d3cc 100755 --- a/debian/rules +++ b/debian/rules @@ -1,10 +1,11 @@ #!/usr/bin/make -f -# debian/rules for the VideoLAN Client - uses debhelper. +# debian/rules for the VLC media player - uses debhelper. # $Id$ # based on Joey Hess's one. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +include /usr/share/dpatch/dpatch.make # # Compilation options @@ -12,14 +13,14 @@ 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 \ @@ -29,7 +30,7 @@ CONFIG_FLAGS += \ --enable-dvbpsi \ --enable-xosd \ --enable-mozilla \ - --enable-kde \ + --disable-kde \ --enable-mp4 \ --enable-dvb \ --enable-dv \ @@ -37,24 +38,35 @@ CONFIG_FLAGS += \ --enable-ogg \ --enable-vorbis \ --enable-wxwindows \ - --enable-slp \ + --with-wx-config=wxgtk-2.4-config \ + --disable-slp \ --enable-flac \ - --enable-skins \ + --disable-skins \ --disable-basic-skins \ + --enable-skins2 \ --enable-freetype \ --enable-mkv \ --enable-v4l \ --enable-pvr \ - --enable-speex \ + --disable-speex \ --enable-caca \ --enable-livedotcom \ --enable-libmpeg2 \ --enable-dts \ + --enable-fribidi \ + --enable-cdio \ + --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-faad --with-faad-tree=extras/faad2 +CONFIG_FLAGS += --enable-x264 --with-x264-tree=extras/x264 # Glide and svgalib are only for x86 ifeq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386) @@ -85,13 +97,11 @@ 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 + # 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 \ - cd extras/ffmpeg \ - && CC=$(CC) ./configure --enable-pp --enable-gpl --enable-zlib --disable-debug \ - && cd libavcodec \ - && $(MAKE); \ + cd extras/x264 \ + && jam -dx libx264.a; \ fi # Check that we have an faad2 tree in here (can be a symlink) @@ -114,8 +124,8 @@ configure-stamp: touch configure-stamp -build: configure-stamp build-stamp -build-stamp: +build: build-stamp +build-stamp: patch configure-stamp dh_testdir # Build only VLC, with the non-PIC libs @@ -123,15 +133,14 @@ build-stamp: cd modules && AM_MAKEFLAGS='plugin=no pic=no' $(MAKE) $(MAKE) vlc -ifneq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386) # 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.pic \ - && $(MAKE) -f Makefile.pic \ - && rm -f Makefile.pic; \ + cd extras/x264 \ + && jam -dx clean \ + && rm -f Jamfile.pic \ + && sed 's/^CCFLAGS *=/& -fPIC -DPIC /' Jamfile.pic \ + && jam -dx -sJAMFILE=Jamfile.pic libx264.a \ + && rm -f Jamfile.pic; \ fi # HACKETY HACKETY HACK @@ -140,22 +149,21 @@ ifneq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386) && $(MAKE) clean \ && $(MAKE) AM_CFLAGS=-fPIC; \ fi -endif # Build all the rest, with the PIC libs AM_MAKEFLAGS='builtin=no' $(MAKE) touch build-stamp -clean: +clean: unpatch dh_testdir 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 + # 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 \ - cd extras/ffmpeg && $(MAKE) distclean; \ + cd extras/x264 && jam -dx clean; \ fi # Check that we have an faad2 tree in here (can be a symlink) test -d extras/faad2 @@ -191,6 +199,9 @@ install: build #cp doc/fortunes.txt debian/vlc/usr/share/games/fortunes/vlc #strfile doc/fortunes.txt debian/vlc/usr/share/games/fortunes/vlc.dat + rm -Rf debian/vlc/$(VIDDIR)/skins + ln -s vlc.1.gz debian/vlc/usr/share/man/man1/svlc.1.gz + # Package: libvlc0-dev mv debian/vlc/usr/bin/vlc-config debian/libvlc0-dev/usr/bin/ mv debian/vlc/usr/lib/*.a debian/libvlc0-dev/usr/lib/ @@ -200,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/ @@ -281,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/ @@ -308,15 +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/usr/share/vlc/ui.rc \ - debian/kvlc/usr/share/vlc - 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) @@ -327,16 +337,11 @@ endif # Package: wxvlc mv debian/vlc/usr/bin/wxvlc debian/wxvlc/usr/bin/ - mv debian/vlc/usr/bin/svlc debian/wxvlc/usr/bin/ ln -s vlc debian/wxvlc/usr/share/doc/wxvlc + cp debian/vlc/$(VIDDIR)/vlc.xpm debian/wxvlc/$(VIDDIR)/wxvlc.xpm mv debian/vlc/usr/lib/vlc/gui/libwxwindows_plugin.so \ debian/wxvlc/usr/lib/vlc/gui/ - mv debian/vlc/usr/lib/vlc/gui/libskins_plugin.so \ - debian/wxvlc/usr/lib/vlc/gui/ - mv debian/vlc/usr/share/vlc/skins \ - debian/wxvlc/usr/share/vlc/ ln -s vlc.1.gz debian/wxvlc/usr/share/man/man1/wxvlc.1.gz - ln -s vlc.1.gz debian/wxvlc/usr/share/man/man1/svlc.1.gz # Clean up rm -f debian/vlc/$(VIDDIR)/*.png