Author: pebender
Date: Tue Nov 25 21:07:26 2008
New Revision: 4011
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/Makefile
trunk/gar-minimyth/script/mediaplayers/mplayer-vld/Makefile
Log:
- Made mplayer-svn rather than mplayer-vld the default mplayer version.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Tue Nov 25
21:07:26 2008
@@ -28,6 +28,8 @@
certain capabilities.
- Made sure that all are using the shared libdca rather than their
internal versions of libdca/libdts.
+ - Made mplayer-svn the default mplayer version.
+ - mpplayer is linked to mplayer-svn.
- Renamed mplayer-stable to mplayer-vld in order to reflect that the
only
reason it continues to be included is because it supports XvMC-VLD.
Modified: trunk/gar-minimyth/script/mediaplayers/mplayer-svn/Makefile
==============================================================================
--- trunk/gar-minimyth/script/mediaplayers/mplayer-svn/Makefile (original)
+++ trunk/gar-minimyth/script/mediaplayers/mplayer-svn/Makefile Tue Nov 25
21:07:26 2008
@@ -15,7 +15,7 @@
CONFIGURE_SCRIPTS = $(WORKSRC)/configure
BUILD_SCRIPTS = $(WORKSRC)/Makefile
-INSTALL_SCRIPTS = custom
+INSTALL_SCRIPTS = $(WORKSRC)/Makefile config
# Directories
CONFIGURE_ARGS_DIR = \
@@ -219,7 +219,7 @@
--disable-static \
--charset="UTF-8" \
--language="all" \
- --with-install="$(DESTDIR)$(bindir)"
+ --with-install="$(build_DESTDIR)$(build_bindir)/install"
CONFIGURE_ARGS_ADVANCED = \
--enable-mmx \
--enable-mmxext \
@@ -286,7 +286,17 @@
checksum-$(DISTNAME).tar.bz2:
@$(MAKECOOKIE)
-install-custom:
- @mkdir -p $(DESTDIR)$(bindir)
- @cp $(WORKSRC)/mplayer $(DESTDIR)$(bindir)/mplayer-svn
+install-config:
+ @mkdir -p $(DESTDIR)$(rootdir)/root/.mplayer
+ @cp $(WORKSRC)/etc/codecs.conf $(DESTDIR)$(rootdir)/root/.mplayer
+ @cp $(WORKSRC)/etc/example.conf $(DESTDIR)$(rootdir)/root/.mplayer
+ @cp $(WORKSRC)/etc/input.conf $(DESTDIR)$(rootdir)/root/.mplayer
+ @cp $(WORKSRC)/etc/menu.conf $(DESTDIR)$(rootdir)/root/.mplayer
+ @$(MAKECOOKIE)
+
+post-install:
+ @rm -f $(DESTDIR)$(bindir)/mplayer-svn
+ @mv -f $(DESTDIR)$(bindir)/mplayer $(DESTDIR)$(bindir)/mplayer-svn
+ @rm -f $(DESTDIR)$(bindir)/mplayer
+ @ln -fs mplayer-svn $(DESTDIR)$(bindir)/mplayer
@$(MAKECOOKIE)
Modified: trunk/gar-minimyth/script/mediaplayers/mplayer-vld/Makefile
==============================================================================
--- trunk/gar-minimyth/script/mediaplayers/mplayer-vld/Makefile (original)
+++ trunk/gar-minimyth/script/mediaplayers/mplayer-vld/Makefile Tue Nov 25
21:07:26 2008
@@ -4,7 +4,6 @@
MASTER_SITES = http://www1.mplayerhq.hu/MPlayer/releases/
MASTER_SITES += http://www2.mplayerhq.hu/MPlayer/releases/
MASTER_SITES += http://www4.mplayerhq.hu/MPlayer/releases/
-MASTER_SITES += svn://svn.mplayerhq.hu/
DISTFILES = $(DISTNAME).tar.bz2
PATCHFILES = \
$(DISTNAME)-demux_audio_fix_20080129.patch \
@@ -25,7 +24,7 @@
CONFIGURE_SCRIPTS = $(WORKSRC)/configure
BUILD_SCRIPTS = $(WORKSRC)/Makefile
-INSTALL_SCRIPTS = $(WORKSRC)/Makefile config
+INSTALL_SCRIPTS = custom
# Directories
CONFIGURE_ARGS_DIR = \
@@ -263,20 +262,7 @@
@cd $(PARTIALDIR) ; rm -rf $(DISTNAME)
@$(MAKECOOKIE)
-checksum-$(DISTNAME).tar.bz2:
- @$(MAKECOOKIE)
-
-install-config:
- @mkdir -p $(DESTDIR)$(rootdir)/root/.mplayer
- @cp $(WORKSRC)/etc/codecs.conf $(DESTDIR)$(rootdir)/root/.mplayer
- @cp $(WORKSRC)/etc/example.conf $(DESTDIR)$(rootdir)/root/.mplayer
- @cp $(WORKSRC)/etc/input.conf $(DESTDIR)$(rootdir)/root/.mplayer
- @cp $(WORKSRC)/etc/menu.conf $(DESTDIR)$(rootdir)/root/.mplayer
- @$(MAKECOOKIE)
-
-post-install:
- @rm -f $(DESTDIR)$(bindir)/mplayer-vld
- @mv -f $(DESTDIR)$(bindir)/mplayer $(DESTDIR)$(bindir)/mplayer-vld
- @rm -f $(DESTDIR)$(bindir)/mplayer
- @ln -fs mplayer-vld $(DESTDIR)$(bindir)/mplayer
+install-custom:
+ @mkdir -p $(DESTDIR)$(bindir)
+ @cp $(WORKSRC)/mplayer $(DESTDIR)$(bindir)/mplayer-vld
@$(MAKECOOKIE)
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
