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

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

ChangeLog

-[]
+Tue Aug  8 11:24:01 CEST 2000
 0.1.99f :
 
   * plugin detection now works

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} )

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
 

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)

debian/changelog

+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

debian/dirs

 usr/bin
 usr/lib/videolan/vlc
-usr/share/videolan/vlc
+usr/share/videolan

debian/files

-vlc_0.1.99c_i386.deb graphics optional
+vlc_0.1.99f_i386.deb graphics optional

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

debian/postrm.debhelper

 # 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

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

debian/substvars

-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)

debian/vlc.menu

 ?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"

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)

vlc.spec

 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