* darwin buildflag for vlc/libvlc

[vlc] / debian / rules

diff --git a/debian/rules b/debian/rules
index 7f1b3682c161e6f27f1770a9690260fe1b650d7d..f9648e6ba0a9eaf2586b3602926d370006cc07cf 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #!/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.
 
@@ -39,8 +39,9 @@ CONFIG_FLAGS += \
        --enable-wxwindows \
        --enable-slp \
        --enable-flac \
-       --enable-skins \
+       --disable-skins \
        --disable-basic-skins \
+       --enable-skins2 \
        --enable-freetype \
        --enable-mkv \
        --enable-v4l \
@@ -50,6 +51,9 @@ CONFIG_FLAGS += \
        --enable-livedotcom \
        --enable-libmpeg2 \
        --enable-dts \
+       --enable-fribidi \
+       --enable-cdio \
+       --enable-mod \
        $(NULL)
 
 # These ones are currently shipped with VLC
@@ -87,16 +91,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 -d .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 -d .svn ')'; then \
          cd extras/faad2 \
          && touch `find . -name configure.in` \
          && touch `find . -name aclocal.m4` \
@@ -125,7 +129,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 -d .svn ')'; then \
          cd extras/ffmpeg/libavcodec \
          && $(MAKE) clean \
          && rm -f Makefile.pic \
@@ -135,7 +139,7 @@ ifneq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386)
        fi
 
        # HACKETY HACKETY HACK
-       if test ! -d CVS; then \
+       if test ! '(' -d CVS -o -d .svn ')'; then \
          cd extras/faad2/libfaad \
          && $(MAKE) clean \
          && $(MAKE) AM_CFLAGS=-fPIC; \
@@ -154,10 +158,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 -d .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 -d .svn ')'; then \
+         cd extras/faad2 && $(MAKE) distclean; \
+       fi
 
        # Removed ugly cruft
        rm -f src/misc/modules_builtin.h
@@ -187,6 +195,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/usr/share/vlc/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/
@@ -323,16 +334,10 @@ 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
        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