* Borrowed Mandrakesoft's vlc.spec and libdvdcss.spec ;

* New configure option --with-tuning=[arch], extending --enable-pentiumpro ;
for Pentium, use --with-tuning=pentium, for PowerPC 604 use --with-tuning=604,
and so on.

Makefile.opts.in

@@ -39,6 +39,7 @@ TRACE = @TRACE@
 CPROF = @CPROF@
 GPROF = @GPROF@
 OPTIMS = @OPTIMS@
+TUNING = @TUNING@
 
 # 
 # Build environment
@@ -226,17 +227,13 @@ endif
 
 # Optimizations for x86 familiy
 ifneq (,$(findstring 86,$(ARCH)))
-# Optional Pentium Pro optimizations
-ifneq (,$(findstring ppro,$(ARCH)))
-CFLAGS += -mcpu=pentiumpro
-else
-CFLAGS += -mcpu=pentium
-endif
+CFLAGS += -mcpu=$(TUNING)
 endif
 
 # Optimizations for PowerPC
 ifneq (,$(findstring powerpc,$(ARCH)))
-CFLAGS += -mmultiple -mhard-float -mstring
+CFLAGS += -mmultiple -mhard-float -mstring -mcpu=powerpc
+CFLAGS += -mtune=$(TUNING)
 endif
 
 # Optimizations for Sparc

configure.in

@@ -422,12 +422,19 @@ case ${target_os} in
 esac
 
 dnl
-dnl  PentiumPro acceleration
+dnl  Special arch tuning
 dnl
-AC_ARG_ENABLE(ppro,
-  [  --disable-ppro          Disable PentiumPro optimizations (default enabled for x86)],
-[ if test x$enableval = xyes; then ARCH="${ARCH} ppro"; fi ],
-[ if test x$ARCH = xi686; then ARCH="${ARCH} ppro"; fi ])
+AC_ARG_WITH(tuning,
+[  --with-tuning=[arch]    Enable special tuning for an architecture
+                          (default i686 on IA-32 and 750 on PPC)])
+if test "x$withval" != "x"; then
+    TUNING=$withval
+else
+    if test x$ARCH = xi686; then TUNING="pentiumpro"
+    else
+        if test x$ARCH = ppc; then TUNING="750"; fi
+    fi
+fi
 
 dnl
 dnl  MMX acceleration
@@ -514,7 +521,10 @@ NEED_LIBDVDCSS=0
 STATIC_LIBDVDCSS=0
 DUMMY_LIBDVDCSS=0
 AC_ARG_WITH(dvdcss,
-  [  --with-dvdcss[=name]    way to use libdvdcss, either 'yes' or 'no', or 'local-static', 'local-shared', or a path to another libdvdcss such as '/usr/local' (default 'local-static')],
+  [  --with-dvdcss[=name]    way to use libdvdcss, either 'yes' or 'no',
+                          or 'local-static', 'local-shared', or a path to
+                          another libdvdcss such as '/usr/local'
+                          (default 'local-static')],
   [ case "x${withval}" in
     xlocal-static|xyes)
       # local libdvdcss, statically linked
@@ -656,7 +666,7 @@ dnl
 dnl  Darwin module
 dnl
 AC_ARG_ENABLE(darwin,
-  [  --enable-darwin         Darwin sound support (default disabled)],
+  [  --enable-darwin         Darwin sound support (default enabled on MacOS X)],
   [if test x$enable_darwin = xyes; then
      PLUGINS="${PLUGINS} darwin"
      LIB_DARWIN="-framework CoreAudio"
@@ -666,7 +676,7 @@ dnl
 dnl  MacOS X module
 dnl
 AC_ARG_ENABLE(macosx,
-  [  --enable-macosx         Mac OS X interface support (default enabled in Mac OS X)],
+  [  --enable-macosx         MacOS X support (default enabled on MacOS X)],
   [if test x$enable_macosx = xyes
    then
      BUILTINS="${BUILTINS} macosx"
@@ -685,7 +695,7 @@ dnl
 dnl  QNX RTOS module
 dnl
 AC_ARG_ENABLE(qnx,
-  [  --disable-qnx           QNX RTOS support (default enabled in QNX RTOS)])
+  [  --disable-qnx           QNX RTOS support (default enabled on QNX RTOS)])
     if test x$enable_qnx != xno
     then
       AC_CHECK_HEADERS(Ph.h, [
@@ -961,7 +971,8 @@ dnl
 dnl  ALSA module
 dnl
 AC_ARG_ENABLE(alsa,
-  [  --enable-alsa           Alsa sound drivers support (Only for linux) (default disabled)],
+  [  --enable-alsa           Alsa sound drivers support (Only for linux)
+                          (default disabled)],
   [if test x$enable_alsa = xyes
    then
      AC_CHECK_HEADER(sys/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false")
@@ -991,6 +1002,7 @@ AC_SUBST(TRACE)
 AC_SUBST(CPROF)
 AC_SUBST(GPROF)
 AC_SUBST(OPTIMS)
+AC_SUBST(TUNING)
 AC_SUBST(NEED_GETOPT)
 AC_SUBST(MOC)
 AC_SUBST(WINDRES)
@@ -1044,7 +1056,8 @@ global configuration
 --------------------
 system                : ${SYS}
 architecture          : ${ARCH}
-optimizations         : ${OPTIMS}"
+optimizations         : ${OPTIMS}
+tuning:               : ${TUNING}"
 
 if test x${HAVE_VLC} = x1
 then

extras/libdvdcss/libdvdcss.spec

+# This is borrowed and adapted from Mandrake's Cooker
+%define name 	libdvdcss
+%define version	0.0.3
+%define release	1
+%define major  	0
+%define lib_name %{name}%{major}
+
+Summary:	A library for accessing DVDs like block device, deciphering CSS encryption if needed.
+Name:		%{name}
+Version:	%{version}
+Release:	%{release}
+
+Source0:	http://www.videolan.org/pub/videolan/libdvcss/%{version}/%{name}-%{version}.tar.bz2
+License:	GPL
+Group:		System/Libraries
+URL:		http://videolan.org/
+BuildRoot:	%_tmppath/%name-%version-%release-root
+
+%description
+libdvdcss is a simple library designed for accessing DVDs like a block device
+without having to bother about the decryption. The important features are:
+ * Portability. Currently supported platforms are GNU/Linux, FreeBSD, BeOS
+   and Windows. The MacOS X version is being worked on as well.
+ * Simplicity. There are currently 7 functions in the API, and we intend to
+   keep this number low.
+ * Freedom. libdvdcss is released under the General Public License, ensuring
+   it will stay free, and used only for free software products.
+ * Just better. Unlike most similar projects, libdvdcss doesn't require the
+   region of your drive to be set.
+
+%package -n %{lib_name}
+Summary:        A library for accessing DVDs like block device, deciphering CSS encryption if needed.
+Group:          System/Libraries
+Provides:       %name
+
+%description -n %{lib_name}
+libdvdcss is a simple library designed for accessing DVDs like a block device 
+without having to bother about the decryption. The important features are:
+ * Portability. Currently supported platforms are GNU/Linux, FreeBSD, BeOS
+   and Windows. The MacOS X version is being worked on as well.
+ * Simplicity. There are currently 7 functions in the API, and we intend to 
+   keep this number low.
+ * Freedom. libdvdcss is released under the General Public License, ensuring
+   it will stay free, and used only for free software products.
+ * Just better. Unlike most similar projects, libdvdcss doesn't require the 
+   region of your drive to be set.
+
+%package -n %{lib_name}-devel
+Summary:        Development tools for programs which will use the libdvdcss library.
+Group:          Development/C
+Provides:       %name-devel
+Requires:	%{lib_name} = %{version}
+ 
+%description -n %{lib_name}-devel
+The %{name}-devel package includes the header files and static libraries
+necessary for developing programs which will manipulate DVDs files using
+the %{name} library.
+ 
+ If you are going to develop programs which will manipulate DVDs,
+ you should install %{name}-devel.  You'll also need to have the %name
+ package installed.
+ 
+
+%prep
+%setup -q
+
+%build
+%configure
+%make
+
+%install
+%makeinstall
+
+%clean
+rm -fr %buildroot
+
+%post -n %{lib_name} -p /sbin/ldconfig
+ 
+%postun -n %{lib_name} -p /sbin/ldconfig
+
+%files -n %{lib_name}
+%defattr(-,root,root,-)
+%doc COPYING AUTHORS
+%{_libdir}/*.so.*
+
+%files -n %{lib_name}-devel
+%defattr(-,root,root)
+%doc COPYING
+%{_libdir}/*.a
+%{_libdir}/*.so
+%{_includedir}/*
+
+%changelog
+* Tue Oct 02 2001 Christophe Massiot <massiot@via.ecp.fr>
+- Imported Mandrake's vlc.spec into the CVS
+
+* Thu Aug 23 2001 Yves Duret <yduret@mandrakesoft.com> 0.0.3-1mdk
+- version 0.0.3
+
+* Mon Aug 13 2001 Yves Duret <yduret@mandrakesoft.com> 0.0.2-1mdk
+- version 0.0.2
+
+* Tue Jun 19 2001 Yves Duret <yduret@mandrakesoft.com> 0.0.1-1mdk
+- first release and first mdk release
+
+#EOF

vlc.spec

-Name: vlc
-Version: 0.2.83
-Release: 1
-License: GPL
-Url: http://www.videolan.org/
-Group: X11/Applications/Graphics
-Source0: http://www.videolan.org/packages/0.2.83/vlc-0.2.83.tar.gz
-Prefix: /usr
-Packager: Samuel Hocevar <sam@zoy.org>
-
-Buildroot: /tmp/vlc-build
-Summary: VideoLAN Client.
-Summary(fr): Client VideoLAN.
+# This is borrowed and adapted from Mandrake's Cooker
+%define name 	vlc
+%define vlc_ver 0.2.83
+%define version	%vlc_ver
+
+# libdvdcss
+%define major   0
+%define lib_ver 0.0.3
+%define lib_name libdvdcss%{major}
+
+%define cvs     0
+
+%if %{cvs}
+%define cvsdate 20011002
+%define release	0.%{cvsdate}
+%define cvs_name %{name}-snapshot-%{cvsdate}-00
+%else
+%define release 1
+%endif
+
+Summary:	VideoLAN is a free MPEG, MPEG-2 and DVD software solution.
+Name:		%{name}
+Version:	%{version}
+Release:	%{release}
+
+%if %{cvs} 
+Source0:	http://www.videolan.org/pub/videolan/vlc/snapshots/%{cvs_name}.tar.bz2
+%else
+Source0:	http://www.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.bz2
+%endif
+License:	GPL
+Group:		Video
+URL:		http://videolan.org/
+BuildRoot:	%_tmppath/%name-%version-%release-root
+#This is for Mandrake :
+#Buildrequires:	libncurses5-devel
+#Buildrequires:	libqt2-devel
+#Buildrequires:	libgtk+1.2-devel
+#Buildrequires:	gnome-libs-devel
+#Buildrequires:	db1-devel
+#This is for RedHat :
+Buildrequires: ncurses-devel
+Buildrequires: qt2-devel
+Buildrequires: gtk+-devel
+Buildrequires:	gnome-libs-devel
+Buildrequires: db1
 
-%changelog
-* Wed Aug 22 2001 Samuel Hocevar <sam@zoy.org>
-New upstream release (0.2.83)
-
-* Tue Aug 7 2001 Samuel Hocevar <sam@zoy.org>
-New upstream release (0.2.82)
-
-* Sat Jul 28 2001 Samuel Hocevar <sam@zoy.org>
-New upstream release (0.2.81)
-
-* Tue Jun 5 2001 Samuel Hocevar <sam@zoy.org>
-New upstream release (0.2.80)
+%description
+VideoLAN is a free network-aware MPEG and DVD player.
+The VideoLAN Client allows to play MPEG-2 Transport Streams from the
+network or from a file, as well as direct DVD playback.
+VideoLAN is a project of students from the Ecole Centrale Paris.
+This version add MPEG-1 support, direct DVD support, DVD decryption, 
+arbitrary, seeking in the stream, pause, fast forward and slow motion, 
+hardware YUV acceleration and a few new interface features 
+including drag'n'drop.
+You may install vlc-gnome, vlc-gtk and vlc-qt vlc-gnome vlc-ncurses.
+
+%package gtk
+Summary: Gtk plug-in for VideoLAN, a DVD and MPEG-2 player
+Group: Video
+Requires: %{name} = %{version}
+%description gtk
+The vlc-gtk packages includes the Gtk plug-in for the VideoLAN client.
+If you are going to watch DVD with the Gtk front-end, you should 
+install vlc-gtk.
+
+
+%package gnome
+Summary: Gnome plug-in for VideoLAN, a DVD and MPEG-2 player
+Group: Video
+Requires: %{name} = %{version}
+%description gnome
+The vlc-gnome packages includes the Gnome plug-in for the VideoLAN client.
+If you are going to watch DVD with the Gnome front-end, you should 
+install vlc-gnome.
+
+%package qt
+Summary: Qt2 plug-in for VideoLAN, a DVD and MPEG-2 player
+Group: Video
+Requires: %{name} = %{version}
+%description qt
+The vlc-qt packages includes the Qt2 plug-in for the VideoLAN client.
+If you are going to watch DVD with the Qt2 front-end, you should
+install vlc-qt
+
+%package ncurses
+Summary: Ncurses console-based plug-in for VideoLAN, a DVD and MPEG-2 player
+Group: Video
+Requires: %{name} = %{version}
+%description ncurses
+The vlc-ncurses packages includes the ncurses plug-in for the VideoLAN client.
+If you are going to watch DVD with the ncurses front-end, you should
+install vlc-ncurses
 
-* Mon Apr 30 2001 Arnaud Gomes-do-Vale <arnaud@glou.org>
-Added relocation support and compile fixes for Red Hat 7.x.
 
-* Sat Apr 28 2001 Henri Fallon <henri@videolan.org>
-New upstream release (0.2.73)
+%prep
+%if %{cvs}
+%setup -q -n %{cvs_name}
+%else
+%setup -q -n %{name}-%{vlc_ver}
+%endif
 
-* Mon Apr 16 2001 Samuel Hocevar <sam@zoy.org>
-New upstream release (0.2.72)
+%build
+%configure --with-dvdcss=local-shared \
+       --enable-gnome --enable-gtk \
+	   --enable-x11 --enable-qt --enable-ncurses \
+	   --enable-esd --disable-alsa \
+	   --enable-fb \
+	   --enable-xvideo \
+	   --with-sdl 
+export QTDIR=%{_libdir}/qt2 
+%make
 
-* Fri Apr 13 2001 Samuel Hocevar <sam@zoy.org>
-New upstream release (0.2.71)
+%install
+%makeinstall
+install -d %buildroot/%_mandir/man1
+install doc/vlc.1 %buildroot/%_mandir/man1
 
-* Sun Apr 8 2001 Christophe Massiot <massiot@via.ecp.fr>
-New upstream release (0.2.70)
+%clean
+rm -fr %buildroot
 
-* Fri Feb 16 2001 Samuel Hocevar <sam@via.ecp.fr>
-New upstream release
+%files
+%defattr(-,root,root,-)
+%doc README COPYING
+%{_bindir}/vlc
 
-* Tue Aug  8 2000 Samuel Hocevar <sam@via.ecp.fr>
-Added framebuffer support
+%{_libdir}/videolan/vlc/dsp.so
+%{_libdir}/videolan/vlc/esd.so
+%{_libdir}/videolan/vlc/fb.so
+%{_libdir}/videolan/vlc/sdl.so
+%{_libdir}/videolan/vlc/x*.so
 
-* Sun Jun 18 2000 Samuel Hocevar <sam@via.ecp.fr>
-Took over the package
+%dir %{_datadir}/videolan
+%{_datadir}/videolan/*
+%{_mandir}/man1/*
 
-* Thu Jun 15 2000 Eric Doutreleau <Eric.Doutreleau@int-evry.fr>
-Initial package
+%files gtk
+%defattr(-,root,root)
+%{_libdir}/videolan/vlc/gtk.so
+%{_bindir}/gvlc
 
-%description
-a free network-aware MPEG and DVD player
- VideoLAN is a free MPEG1/2 software solution.
- .
- The VideoLAN Client allows to play MPEG2 Transport Streams from the
- network or from a file, as well as direct DVD playback.
-
-%description -l fr
-Un lecteur MPEG et DVD utilisable en rseau.
-VideoLAN est un lecteur MPEG1/2. Le client VideoLAN permet la lecture de
-flux MPEG2 depuis le rseau ou depuis un fichier, en plus de la lecture
-directe des DVD.
+%files gnome
+%defattr(-,root,root)
+%{_libdir}/videolan/vlc/gnome.so
+%{_bindir}/gnome-vlc
 
-%prep
-%setup 
+%files qt
+%defattr(-,root,root)
+%{_libdir}/videolan/vlc/qt.so
+%{_bindir}/qvlc
 
-%build
-if [ -x %{prefix}/bin/kgcc ] ;
-then
-  CC=%{prefix}/bin/kgcc ./configure --prefix=%{prefix} --with-sdl --enable-esd --enable-gnome --enable-qt
-else
-  ./configure --prefix=%{prefix} --with-sdl --enable-esd --enable-gnome --enable-qt
-fi
-if [ -x %{prefix}/bin/kgcc ] ;
-then
-  CC=%{prefix}/bin/kgcc make
-else
-  make
-fi
-%install
-mkdir -p $RPM_BUILD_ROOT%{prefix}/lib
-mkdir -p $RPM_BUILD_ROOT%{prefix}/bin
-make install prefix=$RPM_BUILD_ROOT%{prefix}
+%files ncurses
+%defattr(-,root,root)
+%{_libdir}/videolan/vlc/ncurses.so
 
-%files
-%attr(-, root, root) %{prefix}/bin/vlc
-%attr(-, root, root) %{prefix}/share/videolan
-%attr(-, root, root) %{prefix}/lib/videolan
-%attr(-, root, root) %doc ChangeLog AUTHORS COPYING INSTALL README TODO doc
-%clean
-rm -rf $RPM_BUILD_ROOT
 
+%changelog
+* Tue Oct 02 2001 Christophe Massiot <massiot@via.ecp.fr>
+- Imported Mandrake's vlc.spec into the CVS
+
+* Thu Aug 23 2001 Yves Duret <yduret@mandrakesoft.com> 0.2.83-1mdk
+- version 0.2.83 : 
+  * Activated subtitles in overlay mode (far from perfect, but this
+    was an often requested feature).
+
+* Fri Aug 10 2001 Yves Duret <yduret@mandrakesoft.com> 0.2.82-1mdk
+- version 0.2.82
+
+* Mon Jul 30 2001 Yves Duret <yduret@mandrakesoft.com> 0.2.81-1mdk
+- version 0.2.81
+- added vlc-ncurses
+
+* Wed Jun 20 2001 Yves Duret <yduret@mandrakesoft.com> 0.2.81-0.20010619-1mdk
+- cvs snapshot
+- added libdvdcss
+
+* Wed Jun 13 2001 Yves Duret <yduret@mandrakesoft.com> 0.2.80-2mdk
+- fix build on ppc (c) dadou
+
+* Mon Jun 11 2001 Yves Duret <yduret@mandrakesoft.com> 0.2.80-1mdk
+- version 0.2.80 : bug fixes and bug fixes and bug fixes and small
+  improvements of the gtk interface.
+- corrected Summary in vlc-qt
+
+* Wed May 23 2001 Yves Duret <yduret@mandrakesoft.com> 0.2.73-2mdk
+- added qt2 plug-in (vlc-qt)
+
+* Wed May 16 2001 Yves Duret <yduret@mandrakesoft.com> 0.2.73-1mdk
+- version 0.2.73
+- you can now get decss threw a plug-in
+- rewritte srcipt to build vlc (decss plugin)
+- rebuild with SDL 1.2
+
+* Thu Apr 26 2001 Yves Duret <yduret@mandrakesoft.com> 0.2.72-2mdk
+- true 0.2.72
+
+* Mon Apr 16 2001 Yves Duret <yduret@mandrakesoft.com> 0.2.72-1mdk
+- version 0.2.72
+- package split into vlc, vlc-gnome, vlc-gtk
+
+* Fri Apr 13 2001 Yves Duret <yduret@mandrakesoft.com> 0.2.71-1mdk
+- version 0.2.71 :
+  * Fixed segfaults when compiled with gcc 3.0pre and versions of gcc
+    shipped with the latest RedHat distributions.                    
+  * Fixed the BeOS CSS decryption.
+  * Fixed a few issues in IFO parsing.
+  * Fixed XVideo video output.
+  * Updated icons under Linux, BeOS, MacOS X.
+
+* Wed Apr 11 2001 Yves Duret <yduret@mandrakesoft.com> 0.2.70-1mdk
+- version 0.2.70
+
+* Thu Mar 22 2001 Yves Duret <yduret@mandrakesoft.com> 0.2.63-1mdk
+- version 0.2.63 : Bugfixes, bugfixes, and bugfixes again, a Gtk+ 
+  interface for the Gnome-impaired, an even better DVD support
+
+* Fri Feb 16 2001 Yves Duret <yduret@mandrakesoft.com> 0.2.61-1mdk
+- new version for all the DVD fans (add MPEG1 support, direct DVD support, 
+  DVD decryption, arbitrary, seeking in the stream, pause, fast forward 
+  and slow motion, hardware YUV acceleration enhanced CSS support and a few 
+  new interface features including drag'n'drop.
+- first *real* public release (now under the GPL)
+
+* Sat Jan 06 2001 David BAUDENS <baudens@mandrakesoft.com> 0.1.99i-2mdk
+- Fix build and use right optimizations on PPC
+- Enable SDL support
+- Spec clean up
+
+* Fri Jan  5 2001 Guillaume Cottenceau <gc@mandrakesoft.com> 0.1.99i-1mdk
+- 0.1.99i, rebuild
+
+* Fri Aug 25 2000 Guillaume Cottenceau <gc@mandrakesoft.com> 0.1.99h-1mdk
+- 0.1.99h
+
+* Mon Jul 10 2000 Guillaume Cottenceau <gc@mandrakesoft.com> 0.1.99c-1mdk
+- first Mandrake package with help of Sam