Dimitar Zhekov <jimmy@is-vn.bg>:

mplayer-1.0pre3
- some .conf and .desc changes
- remove no-freetype21.patch :-)
- add inst-shared-pp.patch :-(
- removed the ban on future upgrades


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2044 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

Documentation/Developers/CHANGELOG-RENE

@@ -7,6 +7,7 @@
  - Sebastian Jaenicke: updated samba (3.0.1) and wwwoffled (2.8a)
  - Alan J. Wylie: updated spamassassin
  - Dimitar Zhekov: workaround for memtest86 to avoid gcc-33 if possible
+                   updated mplayer
 
 *) 2003-12-21 (2.0.0-rc3 - 2.0.0-rc4)
 

package/jimmy/mplayer/inst-shared-pp.patch

@@ -0,0 +1,12 @@
+--- ./Makefile.orig	2003-12-08 23:33:31.000000000 +0200
++++ ./Makefile	2003-12-20 12:49:52.000000000 +0200
+@@ -252,6 +252,9 @@
+ ifeq ($(VIDIX),yes)
+ 	$(DO_MAKE)
+ endif
++ifeq ($(SHARED_PP),yes)
++	$(MAKE) install -C libavcodec/libpostproc
++endif
+ 	if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi
+ 	$(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG)
+ ifeq ($(GUI),yes)

package/jimmy/mplayer/mplayer.conf

@@ -21,7 +21,7 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 mplayer_postmake() {
-	if type -p gtk-config > /dev/null ; then
+	if [ -f $root/var/adm/package/gtk+12 ] ; then
 		echo "extracting the default GUI ..."
 		mkdir -p $datadir/$pkg/Skin
 		tar $taropt $archdir/default-1.7.tar.bz2 -C $datadir/$pkg/Skin
@@ -33,8 +33,7 @@ mplayer_postmake() {
 	ln -sf font-arial-24-iso-8859-1 $datadir/$pkg/font
 
 	echo "copy/move some documentation ..."
-	cp -fR DOCS/*.{css,html} DOCS/tech $docdir
-	rm -f $docdir/users_against_developers.html
+	cp -fR DOCS/HTML/en/*.{css,html} DOCS/tech $docdir
 	mv -f $datadir/$pkg/README* $docdir
 
 	echo "create a default configuration ..."
@@ -59,11 +58,7 @@ mplayer_postmake() {
 sysconfdir="$sysconfdir/mplayer"
 confopt="--prefix=$root/$prefix --confdir=$sysconfdir --enable-menu"
 confopt="$confopt --enable-linux-devfs --with-extraincdir=/usr/include/libpng"
-confopt="$confopt --enable-fbdev --enable-largefiles --enable-streaming"
-confopt="$confopt --enable-shared-pp"
-
-# enable live support if present
-[ -f $root/var/adm/package/rtsp ] && var_append confopt " " "--enable-live"
+confopt="$confopt --enable-fbdev --enable-largefiles --enable-shared-pp"
 
 if [ $arch = x86 ] ; then
 	var_append confopt " " "--with-win32libdir=$root/$prefix/lib/win32"
@@ -77,8 +72,10 @@ if test "$ROCKCFG_PKG_MPLAYER_BLINKENLIGHTS" != 0 ; then
 	var_append confopt " " "--enable-bl"
 fi
 
-type -p gtk-config > /dev/null && var_append confopt " " "--enable-gui"
-test "$ROCKCFG_DISABLE_NLS" = 1 && var_append confopt " " "--disable-i18n"
+test -f $root/var/adm/packages/rtsp && var_append confopt " " "--enable-live"
+test -f $root/var/adm/packages/xmms && var_append confopt " " "--enable-xmms"
+test -f $root/var/adm/packages/gtk+12 && var_append confopt " " "--enable-gui"
+test "$ROCKCFG_DISABLE_NLS" = 0 || var_append confopt " " "--disable-i18n"
 
 postmake=mplayer_postmake
 

package/jimmy/mplayer/mplayer.desc

@@ -23,12 +23,12 @@
 
 [I] A powerful movie player for Linux with subtitles and console support
 
-[T] Yet another media player for Linux. This one with perfect support for
-[T] extra cpu instructions and heavily damaged files. The most important:
-[T] Video codecs: mpeg1 (VCD), mpeg2 (DVD), DivX, OpenDivX, WMV1, Indeo.
-[T] Video devices: X11 (shm & Xvideo), SDL, framebuffer, svgalib, aalib.
+[T] The most capable movie player for Linux. Perfect support for extra cpu
+[T] instructions and damaged files. CLI and GTK+1 GUI. The most important:
+[T] Video codecs: mpeg1/VCD, mpeg2/DVD, DivX, QuickTime, WMV, RealMedia.
+[T] Video devices: X11 (shm/Xvideo/DGA/OpenGL), SDL, framebuffer, svgalib.
 [T] Audio codecs: mpeg layer 2 and 3 (mp3), AC3 dolby, alaw, msgsm, pcm.
-[T] Audio devices: OSS, ALSA (causes delays), ESD with esddsp (untested).
+[T] Audio devices: OSS, ALSA, SDL, ARTS, ESD.
 
 [U] http://www.MPlayerHQ.hu/homepage/
 
@@ -40,12 +40,10 @@
 
 [L] GPL
 [S] Beta
-[V] 0.92
+[V] 1.0pre3
 [P] X -----5---9 679.000
 
-# Please do not upgrade mplayer to 1.0+ series until it's fully cleaned up.
-
-[D] 3055695083 MPlayer-0.92.tar.bz2 http://www.mplayerhq.hu/MPlayer/releases/
+[D] 2443849715 MPlayer-1.0pre3.tar.bz2 http://www.mplayerhq.hu/MPlayer/releases/
 [D] 1060223231 default-1.7.tar.bz2 http://www.mplayerhq.hu/MPlayer/Skin/
 [D] 1043513727 font-arial-iso-8859-1.tar.bz2 http://www.mplayerhq.hu/MPlayer/releases/fonts/
 

package/jimmy/mplayer/no-freetype21.patch

@@ -1,38 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/jimmy/mplayer/no-freetype21.patch
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
- Albeit both FT_Get_{First,Next}_Char seem to exist in freetype
- library, calling them, at least from mplayer, results in linkage
- undefined references. FT_Get_Char_Index links fine, but the cost
- is a slower MPlayer (with subtitles) startup. Any bright ideas?
-
---- ./libvo/font_load_ft.c.orig	2003-01-06 14:23:59.000000000 +0200
-+++ ./libvo/font_load_ft.c	2003-01-26 14:41:20.000000000 +0200
-@@ -30,7 +30,7 @@
- #include "osd_font.h"
- 
- #if (FREETYPE_MAJOR > 2) || (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 1)
--#define HAVE_FREETYPE21
-+// #define HAVE_FREETYPE21
- #endif
- 
- char *get_path(char *filename);