[Lunar-commits] r17182 - in moonbase/trunk/video: . MPlayer
Moritz Heiber
moe at lunar-linux.org
Fri Nov 4 23:52:26 UTC 2005
Author: moe
Date: 2005-11-04 23:52:25 +0000 (Fri, 04 Nov 2005)
New Revision: 17182
Removed:
moonbase/trunk/video/MPlayer-qt/
moonbase/trunk/video/MPlayer-rm/
moonbase/trunk/video/MPlayer-skins/
Modified:
moonbase/trunk/video/MPlayer/BUILD
moonbase/trunk/video/MPlayer/CONFIGURE
moonbase/trunk/video/MPlayer/DEPENDS
moonbase/trunk/video/MPlayer/DETAILS
moonbase/trunk/video/MPlayer/PRE_BUILD
Log:
Huge modification of MPlayer:
* Removed the MPlayer-qt/rm/skins modules:
- qt/rm are no longer maintained. Get the
MPlayer-essentials module
- Seriously, 50 different skins?! If you
want a skin different from the default
go to mplayerhq.hu and chose your favourite
* BUILD/CONFIGURE major cleanups; made use of mquery;
dropped some obsolete/autodetected questions
(Who still has a 3DFX card, eh?).
Made /etc/mplayer the default configuration
directory as mplayer actually needs two different
default configuration files (input/mplayer.conf)
* Enabled largefile and devfs support by default. That
should be alright for anybody today.
* We're installing _one_ default skin now (which is the
official default skin). For other skins see my above
statement
* Removed the obsolete freetype/man/CFLAGS definitions.
Despite of mplayer's configure script nagging about the
CFLAGS I was told in #mplayer that those warnings can
be discarded as they are years old. Yay for Pentium 4
optimized mplayer.
* Cleaned up the DEPENDS (I get 100 extra points for wiping
out the last DEPENDS file with logical definitions in it!).
Note: If you have GTK+ installed but don't want to gui to
be compiled: --opts is your friend.
Its shiny .. isn't it? Now, where's my cookie?
Modified: moonbase/trunk/video/MPlayer/BUILD
===================================================================
--- moonbase/trunk/video/MPlayer/BUILD 2005-11-04 22:11:38 UTC (rev 17181)
+++ moonbase/trunk/video/MPlayer/BUILD 2005-11-04 23:52:25 UTC (rev 17182)
@@ -1,46 +1,43 @@
(
- unset CFLAGS
+ if [ $MENCODER == "n" ] ; then
+ OPTS=$OPTS" --disable-mencoder"
+ fi
+ if [ $OSD == "y" ] ; then
+ OPTS=$OPTS" --enable-menu"
+ fi
+
if module_installed kernel-headers-2.6; then
OPTS="$OPTS --disable-fbdev"
fi
- export LD_LIBRARY_PATH=/usr/X11R6/lib
+ cd $SOURCE_DIRECTORY &&
+
./configure --prefix=/usr \
- --confdir=/etc \
- --mandir=/usr/share/man \
+ --confdir=/etc \
+ --mandir=/usr/share/man \
--with-codecsdir=/usr/lib/win32 \
- $OPTS
+ --enable-linux-devfs \
+ --enable-largefiles \
+ --confdir=/etc/mplayer \
+ --datadir=/usr/share/mplayer \
+ $OPTS &&
- sedit "s/MANDIR = \${prefix}\/man/MANDIR =\/usr\/share\/man/" Makefile &&
- # the following sedit fixes some library issues with freetype2 and xfree86
- # if MPlayer seems to be acting up and having other issues try commenting
- # this sedit
- sedit "s:FREETYPE_LIB = -lfreetype:FREETYPE_LIB = -L/usr/lib -lfreetype:" config.mak &&
+ default_make &&
- make &&
- prepare_install &&
+ gather_docs etc/* &&
+ install -d /usr/share/mplayer/Skin &&
+ install -d /etc/mplayer &&
+ install -m644 etc/codecs.conf /usr/share/mplayer/ &&
+ install -m644 etc/example.conf /etc/mplayer/mplayer.conf &&
+ install -m644 etc/input.conf /etc/mplayer/ &&
- make prefix=/usr install &&
+ cp -a Skin/Blue /usr/share/mplayer/Skin/ &&
+ ln -sf /usr/share/mplayer/Skin/Blue /usr/share/mplayer/Skin/default &&
- mkdir -p $DOCUMENT_DIRECTORY/mplayer &&
- cp -r etc/* $DOCUMENT_DIRECTORY/mplayer &&
- mkdir -p /usr/share/mplayer &&
- cp etc/codecs.conf /usr/share/mplayer &&
-
- if [ ! -f /etc/mplayer.conf ]; then
- sedit "s/include =/# include =/" etc/example.conf
- cp etc/example.conf /etc/mplayer.conf
- fi &&
-
- cp -r fonts /usr/share/mplayer &&
-
- if [ -e /usr/share/mplayer/font ]; then
- rm -rf /usr/share/mplayer/font
- fi &&
-
- rm -f /usr/share/mplayer/font &&
+ cp -a fonts /usr/share/mplayer/ &&
+ rm -rf /usr/share/mplayer/font &&
ln -sf fonts/font-arial-iso-8859-1/font-arial-18-iso-8859-1 /usr/share/mplayer/font
) > $C_FIFO 2>&1
Modified: moonbase/trunk/video/MPlayer/CONFIGURE
===================================================================
--- moonbase/trunk/video/MPlayer/CONFIGURE 2005-11-04 22:11:38 UTC (rev 17181)
+++ moonbase/trunk/video/MPlayer/CONFIGURE 2005-11-04 23:52:25 UTC (rev 17182)
@@ -1,32 +1,2 @@
-if ! grep -q "^OPTS=" $MODULE_CONFIG ; then
-
- if query "Enable GUI support?" y ; then
- OPTS=$OPTS" --enable-gui"
- fi
-
- if query "Disable building of MEncoder ?" n ; then
- OPTS=$OPTS" --disable-mencoder"
- fi
-
- if query "Enable 3DFX Framebuffer support? " n ; then
- OPTS=$OPTS" --enable-tdfxfb"
- fi
-
- if query "Enable Linux devfs support? " y ; then
- OPTS=$OPTS" --enable-linux-devfs"
- fi
-
- if query "Enable OSD support? " y ; then
- OPTS=$OPTS" --enable-menu"
- fi
-
- if query "Enable Large File support? " y ; then
- OPTS=$OPTS" --enable-largefiles"
- fi
-
- if query "Enable Video 4 Linux ver2? " y ; then
- OPTS=$OPTS" --enable-tv-v4l2"
- fi
-
- echo 'OPTS='\"$OPTS\" >> $MODULE_CONFIG
-fi
+ mquery MENCODER "Disable building of MEncoder ?" n
+ mquery OSD "Enable OSD support? " y
Modified: moonbase/trunk/video/MPlayer/DEPENDS
===================================================================
--- moonbase/trunk/video/MPlayer/DEPENDS 2005-11-04 22:11:38 UTC (rev 17181)
+++ moonbase/trunk/video/MPlayer/DEPENDS 2005-11-04 23:52:25 UTC (rev 17182)
@@ -1,5 +1,6 @@
-depends unzip &&
-depends MPlayer-essentials &&
+depends freetype2 &&
+depends unzip &&
+depends MPlayer-essentials &&
optional_depends "libdvdread" \
"" \
@@ -24,29 +25,29 @@
optional_depends "libmatroska" \
"" \
"" \
- "For matroska audio/video container format support" &&
+ "for matroska audio/video container format support" &&
optional_depends "faad" \
- "" \
+ "" \
"" \
- "For external FAAD2 (MPA/AAC) support" &&
+ "for external FAAD2 (MPA/AAC) support" &&
optional_depends "libtheora" \
"--enable-theora" \
"--disable-theora" \
- "For OGG/Theora Video Playback" &&
+ "for OGG/Theora Video Playback" &&
-optional_depends "libXvMCW" "--enable-xvmc --with-xvmclib=XvMCW" "" "For hardware Xv acceleration" &&
+optional_depends "libXvMCW" \
+ "--enable-xvmc --with-xvmclib=XvMCW" \
+ "" \
+ "for hardware Xv acceleration" &&
-case $GUI in
- y|Y|j|J) depends libpng &&
- depends gtk+ &&
- depends MPlayer-skins
- ;;
- *)
- optional_depends "libpng" \
- "--enable-png" \
- "--disable-png" \
- "to display portable network graphics files"
- ;;
-esac
+optional_depends "gtk+" \
+ "--enable-gui" \
+ "--disable-gui" \
+ "for MPlayer GTK gui support" &&
+
+optional_depends "MPlayer-all" \
+ "" \
+ "" \
+ "to install more foreign codecs"
Modified: moonbase/trunk/video/MPlayer/DETAILS
===================================================================
--- moonbase/trunk/video/MPlayer/DETAILS 2005-11-04 22:11:38 UTC (rev 17181)
+++ moonbase/trunk/video/MPlayer/DETAILS 2005-11-04 23:52:25 UTC (rev 17182)
@@ -5,6 +5,7 @@
SOURCE3=font-arial-iso-8859-2.tar.bz2
SOURCE4=font-arial-cp1250.tar.bz2
SOURCE5=font-arial-iso-8859-7.tar.bz2
+ SOURCE6=Blue-1.4.tar.bz2
SOURCE_URL[0]=ftp://ftp1.mplayerhq.hu/$MODULE/releases/
SOURCE_URL[1]=ftp://ftp2.mplayerhq.hu/$MODULE/releases/
SOURCE2_URL[0]=ftp://ftp1.mplayerhq.hu/$MODULE/releases/fonts/
@@ -15,12 +16,14 @@
SOURCE4_URL[1]=ftp://ftp2.mplayerhq.hu/$MODULE/releases/fonts/
SOURCE5_URL[0]=ftp://ftp1.mplayerhq.hu/$MODULE/releases/fonts/
SOURCE5_URL[1]=ftp://ftp2.mplayerhq.hu/$MODULE/releases/fonts/
- SOURCE6_URL[0]=http://www.mplayerhq.hu/MPlayer/patches/
+ SOURCE6_URL[0]=ftp://ftp1.mplayerhq.hu/MPlayer/Skin/
+ SOURCE6_URL[1]=ftp://ftp5.mplayerhq.hu/mplayer/Skin/
SOURCE_VFY=sha1:dcaced128167f15d094c9b63ca8b3dfd8f583e32
SOURCE2_VFY=sha1:152c40bf20de34aa8802d7f80d34d673b0b67212
SOURCE3_VFY=sha1:7b99bbe0e9ba89a57eccbea8f93c453c4f268181
SOURCE4_VFY=sha1:ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68
SOURCE5_VFY=sha1:2a3fa8cf54ec3ed4dfa1a0e72f2d207c13507b9d
+ SOURCE6_VFY=sha1:35a4f687d5f70565d066c9b9cadf5cb60273a0ed
WEB_SITE=http://www.mplayerhq.hu
ENTERED=20010922
UPDATED=20050930
Modified: moonbase/trunk/video/MPlayer/PRE_BUILD
===================================================================
--- moonbase/trunk/video/MPlayer/PRE_BUILD 2005-11-04 22:11:38 UTC (rev 17181)
+++ moonbase/trunk/video/MPlayer/PRE_BUILD 2005-11-04 23:52:25 UTC (rev 17182)
@@ -1,10 +1,12 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+mkdir $SOURCE_DIRECTORY/Skin &&
+cd $SOURCE_DIRECTORY/Skin &&
+unpack $SOURCE6 &&
mkdir $SOURCE_DIRECTORY/fonts &&
cd $SOURCE_DIRECTORY/fonts &&
unpack $SOURCE2 &&
unpack $SOURCE3 &&
unpack $SOURCE4 &&
-unpack $SOURCE5
+unpack $SOURCE5
More information about the Lunar-commits
mailing list