Changeset 916c69e30e8fea86787a4ef04eff48a80f816cd8

Timestamp:

02/10/04 15:33:17 (4 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 1076423597 +0000

git-parent:

[d180753a2ce6fe7d51425b48619bfa44014c2ac6]

git-author:

Sam Hocevar <sam@videolan.org> 1076423597 +0000

Message:

• debian/rules debian/control:
  + No longer build a local libmpeg2 since it entered sid.
  + Build the livedotcom plugin.
  
• toolbox:
  + No longer remove flac, speex and matroska from the woody build; I will
  

provide clean backports.

Files:

• debian/control (modified) (1 diff)
• debian/rules (modified) (6 diffs)
• doc/fortunes.txt (modified) (1 diff)
• toolbox (modified) (4 diffs)

debian/control

@@ -3 +3 @@
-Priority: optional
-Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org>
-
+, liblivemedia-dev, libmpeg2-4-dev
-Build-Conflicts: libmpeg2-dev, libmpeg2-0-dev, libmpeg2-1-dev, libmpeg2-2-dev, libmpeg2-3-dev
-Standards-Version: 3.6.1.0

debian/rules

@@ -1 +1 @@
-#!/usr/bin/make -f
-# debian/rules for the VideoLAN Client - uses debhelper.
-0 2004/01/20 17:45:19
+1 2004/02/10 14:33:17
-# based on Joey Hess's one.
-
@@ -48 +48 @@
-    --enable-speex \
-    --enable-caca \
+    --enable-livedotcom \
+    --enable-libmpeg2 \
-    $(NULL)
-
@@ -53 +55 @@
-CONFIG_FLAGS += --enable-ffmpeg --with-ffmpeg-tree=extras/ffmpeg
-CONFIG_FLAGS += --enable-faad --with-faad-tree=extras/faad2
-CONFIG_FLAGS += --enable-libmpeg2 --with-libmpeg2-tree=extras/mpeg2dec
-
-# Glide and svgalib are only for x86
@@ -107 +108 @@
-    fi
-
-    # Check that we have an mpeg2dec tree in here (can be a symlink)
-    test -d extras/mpeg2dec
-    if test ! -d CVS; then \
-      cd extras/mpeg2dec \
-      && touch configure.in \
-      && touch aclocal.m4 \
-      && touch acinclude.m4 \
-      && touch configure \
-      && touch `find . -name config.h.in` \
-      && touch `find . -name Makefile.in` \
-      && ./configure --disable-shared \
-      && cd libmpeg2 \
-      && $(MAKE); \
-    fi
-
-    # Configure VLC
-    ./configure --mandir=$${prefix}/share/man \
@@ -154 +140 @@
-      && $(MAKE) AM_CFLAGS=-fPIC; \
-    fi
-
-    # HACK ME PLENTY MORE!!!
-    if test ! -d CVS; then \
-      cd extras/mpeg2dec/libmpeg2 \
-      && $(MAKE) clean \
-      && $(MAKE) LIBMPEG2_CFLAGS=-fPIC; \
-    fi
-endif
-
@@ -179 +158 @@
-    test -d extras/faad2
-    -if test ! -d CVS; then cd extras/faad2 && $(MAKE) distclean; fi
-    # Check that we have an mpeg2dec tree in here (can be a symlink)
-    test -d extras/mpeg2dec
-    -if test ! -d CVS; then cd extras/mpeg2dec && $(MAKE) distclean; fi
-
-    # Removed ugly cruft
-    rm -f extras/mpeg2dec/include/mpeg2dec
-    rm -f src/misc/modules_builtin.h
-    rm -f mozilla/vlcintf.xpt mozilla/vlcintf.h

doc/fortunes.txt

@@ -523 +523 @@
-  -- #videolan
-%
+-!- kixx_ changed the topic of #videolan to: VLC 0.7.0 :
+          http://www.videolan.org/ | Fenrir ta cotiz !
+
+  -- #videolan
+%

toolbox

@@ -2 +2 @@
-
-##  toolbox for the VLC media player
-5 2004/01/21 14:44:56
+6 2004/02/10 14:33:17
-##
-##  Authors: Samuel Hocevar <sam@zoy.org>
@@ -630 +630 @@
-  #                  dvb-dev (>= 1.0.1-6) with dvb-dev
-  #          remove libwxgtk2.4-dev
-  #                 libflac-dev
-  #                 libidl0 (workaround for mozilla-dev's bad deps)
-  #                 libglib2.0-0 (workaround for mozilla-dev's bad deps)
-  #                 libmatroska-dev
-  #                 libspeex-dev
-  #                 gcc-3.2 (workaround for an ICE in gcc-3.3)
-  #          change Section: gnome with Section: graphics
@@ -652 +649 @@
-      -e 's/, libwx[^,]*//' \
-      -e '/Package: wxvlc/,/^ *$/d' \
-      -e 's/, libflac-dev[^,]*//' \
-      -e 's/, libidl0[^,]*//' \
-      -e 's/, libglib2.0-0[^,]*//' \
-      -e 's/, libmatroska-dev[^,]*//' \
-      -e 's/, libspeex-dev[^,]*//' \
-      -e 's/, gcc-3.2[^,]*//' \
-      -e 's/Section: gnome/Section: graphics/' \
@@ -665 +659 @@
-
-  # rules: remove wxwindows and skins stuff
-  #        remove flac support
-  #        remove matroska support
-  sed -e '/# Package: wxvlc/,/^ *$/d' \
-      -e 's,--enable-wxwindows,--disable-wxwindows,' \
-      -e 's,--enable-skins,--disable-skins,' \
-      -e 's,--enable-flac,--disable-flac,' \
-      -e 's,--enable-mkv,--disable-mkv,' \
-      -e 's,--enable-speex,--disable-speex,' \
-      < "$1/debian/rules" > "$1/debian/rules.woody"
-  mv "$1/debian/rules.woody" "$1/debian/rules"