. d�commentage d'une fonction comment�e par erreur

 . version 0.1.99f
 . divers fixes dans la cr�ation des packages

diff --git a/ChangeLog b/ChangeLog
index 76e794a057be5d168b9d583ac3f90ba5a44076c4..683593cfa20c8a226c1fb20ddc08c0ca12dae816 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-[]
+Tue Aug  8 11:24:01 CEST 2000
 0.1.99f :
 
   * plugin detection now works

diff --git a/Makefile.in b/Makefile.in
index 706e8da3fbdd32c78e27552ad030d65395409d64..c0f662aa128607d89f91789b49aa64a743657d02 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -352,11 +352,11 @@ distclean: clean
        rm -f Makefile include/defs.h include/config.h
        rm -f config.status config.cache config.log
        rm -f gmon.out core build-stamp
-       rm -rf .dep
+       rm -rf .dep debian/tmp
 
 install:
        mkdir -p $(prefix)/bin
-       $(INSTALL) vlc $(prefix)/bin
+       $(INSTALL) vlc @ALIASES@ $(prefix)/bin
        mkdir -p $(prefix)/lib/videolan/vlc
        $(INSTALL) -m 644 $(PLUGINS) $(prefix)/lib/videolan/vlc
        mkdir -p $(prefix)/share/videolan
@@ -378,6 +378,7 @@ snapshot:
                make distclean ; \
                find . -type d -name CVS | xargs rm -rf ; \
                find . -type f -name '.*.swp' | xargs rm -f ; \
+               find . -type f -name '.cvsignore' | xargs rm -f ; \
                cd .. ; \
                tar czvf ${SNAPSHOTDIR}.tar.gz ${SNAPSHOTDIR} ; \
                tar cIvf ${SNAPSHOTDIR}.tar.bz2 ${SNAPSHOTDIR} )

diff --git a/configure b/configure
index 1762764ba046c237103445438fe05a4d39d42fa4..cb548f516aa39fa466034aefd275af812b35d92f 100755 (executable)
--- a/configure
+++ b/configure
@@ -590,7 +590,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 
-VLC_VERSION=0.1.99e
+VLC_VERSION=0.1.99f
 
 VLC_CODENAME=Onatopp
 

diff --git a/configure.in b/configure.in
index 63d05faf818afcb376fd4b6db0b58c0f63a7d712..d8a2247e05efac02fce712b3229543339000f396 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ AC_CONFIG_HEADER(include/defs.h)
 
 AC_CANONICAL_HOST
 
-VLC_VERSION=0.1.99e
+VLC_VERSION=0.1.99f
 AC_SUBST(VLC_VERSION)
 VLC_CODENAME=Onatopp
 AC_SUBST(VLC_CODENAME)

diff --git a/debian/changelog b/debian/changelog
index 29b8668003e643d090f1152eea37764c1819bb87..f780e4fe09c9a7adb1bb0db46144e382064d74a3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+vlc (0.1.99f) unstable; urgency=low
+
+  * plugin detection now works
+  * "gvlc", "fbvlc", "ggivlc" aliases now work
+  * fixed functions that weren't properly inlined
+  * removed bloat from the MMX YUV plugin
+  * vlc.init becomes ~/.vlcrc
+  * removed float operations in the video decoder, and all emms asm functions
+  * borrowed linuxvideo's MMX motion compensation
+  * fixed an undefined symbol in the MMX YUV plugin
+
+ -- Samuel Hocevar <sam@via.ecp.fr>  Tue,  8 Aug 2000 11:24:01 +0200
+
 vlc (0.1.99e) unstable; urgency=low
 
   * new bitstream syntax and slight performance increase

diff --git a/debian/dirs b/debian/dirs
index 6a702fa1509c62161a5002794426baaa08b62a8c..f2de8b18752a734016a861b0591b9baf4be1cf27 100644 (file)
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,3 +1,3 @@
 usr/bin
 usr/lib/videolan/vlc
-usr/share/videolan/vlc
+usr/share/videolan

diff --git a/debian/files b/debian/files
index 1cb87ed67bfdbeadfa19aeb534a9abecc8e55eb2..357f2c3f3869d617b95c19b323e6df680f03bdb5 100644 (file)
--- a/debian/files
+++ b/debian/files
@@ -1 +1 @@
-vlc_0.1.99c_i386.deb graphics optional
+vlc_0.1.99f_i386.deb graphics optional

diff --git a/debian/postinst.debhelper b/debian/postinst.debhelper
index 85114eeaca17a5d4579b497db251d013a9e1a075..bb9bbd08045984fa58f139c1dca3621cc463a734 100644 (file)
--- a/debian/postinst.debhelper
+++ b/debian/postinst.debhelper
@@ -6,5 +6,5 @@ if [ "$1" = "configure" ]; then
 fi
 # End automatically added section
 # Automatically added by dh_installmenu
-if test -x /usr/bin/update-menus ; then update-menus ; fi
+if [ "$1" = "configure" -a -x /usr/bin/update-menus ]; then update-menus ; fi
 # End automatically added section

diff --git a/debian/postrm.debhelper b/debian/postrm.debhelper
index 0a2512a4a71a71fa798d1cfab8f36f88c512c6b5..b3c6867c66a5cb38919ae968e62e2d6549c634fc 100644 (file)
--- a/debian/postrm.debhelper
+++ b/debian/postrm.debhelper
@@ -1,3 +1,3 @@
 # Automatically added by dh_installmenu
-if test -x /usr/bin/update-menus ; then update-menus ; fi
+if [ -x /usr/bin/update-menus ]; then update-menus ; fi
 # End automatically added section

diff --git a/debian/rules b/debian/rules
index 9643f4cfec7a706501b3ad53836d47ce66f937eb..dc5b5f876cfaf381f0703d65f8578dc7a17ee00c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ build-stamp:
        ./configure --prefix=/usr \
                --mandir=\$${prefix}/share/man \
                --infodir=\$${prefix}/share/info \
-               --enable-ppro --enable-mmx --enable-gnome
+               --enable-mmx --enable-gnome --enable-fb
        $(MAKE)
 
        touch build-stamp

diff --git a/debian/substvars b/debian/substvars
index 52ac02bd3b1f5db0123778bbcbaa5232ddfb63e8..695804c54cd49db0af39c425a1cca565b4b3340b 100644 (file)
--- a/debian/substvars
+++ b/debian/substvars
@@ -1 +1 @@
-shlibs:Depends=gdk-imlib1 (>= 1.9.8-4), libart2 (>= 1.2.1-1), libaudiofile0, libc6 (>= 2.1.2), libdb2 (>= 1:2.4.14-7), libesd0 (>= 0.2.16) | libesd-alsa0 (>= 0.2.16), libglib1.2 (>= 1.2.0), libgnome32 (>= 1.2.1-1), libgnomesupport0 (>= 1.2.1-1), libgnomeui32 (>= 1.2.1-1), libgtk1.2 (>= 1.2.8-1), libz1, xlib6g (>= 3.3.6-4)
+shlibs:Depends=gdk-imlib1 (>= 1.9.8-4), libart2 (>= 1.2.4-1), libaudiofile0, libc6 (>= 2.1.2), libdb2 (>= 1:2.4.14-7), libesd0 (>= 0.2.16) | libesd-alsa0 (>= 0.2.16), libglib1.2 (>= 1.2.0), libgnome32 (>= 1.2.4-1), libgnomesupport0 (>= 1.2.4-1), libgnomeui32 (>= 1.2.4-1), libgtk1.2 (>= 1.2.8-1), xlib6g (>= 3.3.6-4), zlib1g (>= 1:1.1.3)

diff --git a/debian/vlc.menu b/debian/vlc.menu
index 15b2d4b5db8a5f2cd3f3186dadcabed184b99351..5c71cf7377b11b36caff194cb8cb4f3f5fdbdedc 100644 (file)
--- a/debian/vlc.menu
+++ b/debian/vlc.menu
@@ -1,3 +1,3 @@
 ?package(vlc):command="/usr/bin/vlc" hotkey="V" needs="X11" \
                section="Apps/Graphics" title="VideoLAN Client" \
-               icon="/usr/share/videolan/vlc/vlc.png"
+               icon="/usr/share/videolan/vlc.png"

diff --git a/src/video_parser/vpar_blocks.c b/src/video_parser/vpar_blocks.c
index d6dbbe654b2da6c50a669fb82220b575b703740c..afae81f8a39e3711e72635d0585d03ba533f233d 100644 (file)
--- a/src/video_parser/vpar_blocks.c
+++ b/src/video_parser/vpar_blocks.c
@@ -1991,9 +1991,9 @@ void ParseMacroblockGENERIC( vpar_thread_t * p_vpar, int * pi_mb_address,
                              int i_chroma_format, int i_structure,
                              boolean_t b_second_field )
 {
-/*    ParseMacroblock( p_vpar, pi_mb_address, i_mb_previous, i_mb_base,
+    ParseMacroblock( p_vpar, pi_mb_address, i_mb_previous, i_mb_base,
                      b_mpeg2, i_coding_type, i_chroma_format,
-                     i_structure, b_second_field );*/
+                     i_structure, b_second_field );
 }
 
 #if (VPAR_OPTIM_LEVEL > 0)

diff --git a/vlc.spec b/vlc.spec
index 4aa0de6de15b45060f4ebdd595e8ae11b199d397..f83ca8f1a2910cee67b2c19f777c24a93877943d 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,16 +1,19 @@
 Name: vlc
-Version: 0.1.99e
+Version: 0.1.99f
 Release: 1
 Copyright: GPL
 Url: http://www.videolan.org/
 Group: X11/Applications/Graphics
-Source0: http://www.videolan.org/packages/0.1.99e/vlc-0.1.99e.tar.gz
+Source0: http://www.videolan.org/packages/0.1.99f/vlc-0.1.99f.tar.gz
 Packager: Samuel Hocevar <sam@via.ecp.fr>
 
 Buildroot: /tmp/vlc-build
 Summary: VideoLAN Client.
 
 %changelog
+* Tue Aug  8 2000 Samuel Hocevar <sam@via.ecp.fr>
+Added framebuffer support
+
 * Sun Jun 18 2000 Samuel Hocevar <sam@via.ecp.fr>
 Took over the package
 
@@ -28,7 +31,7 @@ a free network-aware MPEG and DVD player
 %setup 
 
 %build
-./configure --prefix=/usr --enable-mmx --enable-gnome
+./configure --prefix=/usr --enable-mmx --enable-gnome --enable-fb
 make
 %install
 mkdir -p $RPM_BUILD_ROOT/usr/lib
@@ -37,7 +40,7 @@ make install prefix=$RPM_BUILD_ROOT/usr
 
 %files
 %attr(-, root, root) /usr/bin/vlc
-%attr(-, root, root) /usr/share/videolan/vlc
+%attr(-, root, root) /usr/share/videolan
 %attr(-, root, root) /usr/lib/videolan
 %attr(-, root, root) %doc AUTHORS COPYING INSTALL NEWS README doc
 %clean