Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (c5caaf8a453cda5f1501c5fa5154da371b81a53d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (c5caaf8a453cda5f1501c5fa5154da371b81a53d)
  • Date: Mon, 6 Nov 2006 12:54:01 -0600

GIT changes to master grimoire by George Sherwood <chat AT sourcemage.org>:

dev/null |binary
video-libs/mplayer-gui/Blue-1.4.tar.bz2.sig | 0
video-libs/mplayer-gui/Blue-1.6.tar.bz2.sig |binary
video-libs/mplayer-gui/DETAILS | 3 +--
video-libs/mplayer-gui/HISTORY | 3 +++
video/mplayer/DEPENDS | 8 ++++----
video/mplayer/DETAILS | 9 ++++-----
video/mplayer/HISTORY | 6 ++++++
video/mplayer/MPlayer-1.0pre8.tar.bz2.sig | 0
video/mplayer/MPlayer-1.0rc1.tar.bz2.sig |binary
video/mplayer/Makefile.patch | 14 --------------
video/mplayer/PRE_BUILD | 3 ---
12 files changed, 18 insertions(+), 28 deletions(-)

New commits:
commit c5caaf8a453cda5f1501c5fa5154da371b81a53d
Author: George Sherwood <chat AT sourcemage.org>
Commit: George Sherwood <chat AT sourcemage.org>

mplayer: Updated to 1.0rc1. Fixed changes in depends options. Removed
Makefile.patch.

mplayer-gui: Updated to 1.6

diff --git a/video-libs/mplayer-gui/Blue-1.4.tar.bz2.sig
b/video-libs/mplayer-gui/Blue-1.4.tar.bz2.sig
deleted file mode 100644
index b431711..0000000
Binary files a/video-libs/mplayer-gui/Blue-1.4.tar.bz2.sig and /dev/null
differ
diff --git a/video-libs/mplayer-gui/Blue-1.6.tar.bz2.sig
b/video-libs/mplayer-gui/Blue-1.6.tar.bz2.sig
new file mode 100644
index 0000000..0ef652b
Binary files /dev/null and b/video-libs/mplayer-gui/Blue-1.6.tar.bz2.sig
differ
diff --git a/video-libs/mplayer-gui/DETAILS b/video-libs/mplayer-gui/DETAILS
index 5ad2e4b..882a7a4 100755
--- a/video-libs/mplayer-gui/DETAILS
+++ b/video-libs/mplayer-gui/DETAILS
@@ -1,5 +1,5 @@
SPELL=mplayer-gui
- VERSION=1.4
+ VERSION=1.6
SOURCE=Blue-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp2.mplayerhq.hu/MPlayer/Skin/$SOURCE
@@ -7,7 +7,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
LICENSE[0]=GPL
SOURCE_GPG="gurus.gpg:$SOURCE.sig"
ENTERED=20020924
- UPDATED=20030127
ARCHIVE="off"
GATHER_DOCS=off
KEYWORDS="player video libs"
diff --git a/video-libs/mplayer-gui/HISTORY b/video-libs/mplayer-gui/HISTORY
index e67a3ed..d00b318 100644
--- a/video-libs/mplayer-gui/HISTORY
+++ b/video-libs/mplayer-gui/HISTORY
@@ -1,3 +1,6 @@
+2006-11-06 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 1.6. Removed UPDATED.
+
2006-10-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* INSTALL: use TRACK_ROOT when linking #9163

diff --git a/video/mplayer/DEPENDS b/video/mplayer/DEPENDS
index 0a85ca0..de6c5b6 100755
--- a/video/mplayer/DEPENDS
+++ b/video/mplayer/DEPENDS
@@ -1,20 +1,20 @@
if [ "$MPLAYER_GUI" == "gtk+" ]
-then depends gtk+ '--enable-gui --enable-old-gtk' &&
+then depends gtk+ '--enable-gui --enable-gtk1' &&
depends mplayer-gui
elif [ "$MPLAYER_GUI" == "gtk+2" ]
then depends gtk+2 '--enable-gui' &&
depends mplayer-gui
fi &&

-if [[ $MPLAYER_SVN = y ]]; then
+if [ "$MPLAYER_SVN" == "y" ]; then
depends subversion &&
optional_depends ffmpeg-svn \
"--disable-libavcodec --enable-libavcodec_so --disable-libavformat
--enable-libavformat_so --disable-libpostproc --enable-libpostproc_so
--disable-libavutil --enable-libavutil_so" "" "to use system ffmpeg instead
of internal one" &&
optional_depends libvorbis "--disable-tremor-internal" "" "to use
external libvorbis to play ogg/vorbis audio"
optional_depends faad2 "--enable-faad-external" "" "to use shared faad
for AAC decoding"
else
- optional_depends libvorbis "--disable-internal-tremor" "" "to use
external libvorbis to play ogg/vorbis audio" &&
- optional_depends faad2 "--enable-external-faad" "" "to use shared faad
for AAC decoding"
+ optional_depends libvorbis "--disable-tremor-internal" "" "to use
external libvorbis to play ogg/vorbis audio" &&
+ optional_depends faad2 "--enable-faad-external" "" "to use shared faad
for AAC decoding"
fi &&

# audio codecs
diff --git a/video/mplayer/DETAILS b/video/mplayer/DETAILS
index 6e6e3a7..de2aa8f 100755
--- a/video/mplayer/DETAILS
+++ b/video/mplayer/DETAILS
@@ -1,6 +1,6 @@
SPELL=mplayer
-if [[ $MPLAYER_SVN = y ]]; then
- if [[ $MPLAYER_SVN_AUTOUPDATE = y ]]; then
+if [ "$MPLAYER_SVN" == "y" ]; then
+ if [ "$MPLAYER_SVN_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
else
VERSION=svn
@@ -11,19 +11,18 @@ if [[ $MPLAYER_SVN = y ]]; then
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
else
- VERSION=1.0pre8
+ VERSION=1.0rc1
SOURCE=MPlayer-$VERSION.tar.bz2
SOURCE_URL[0]=ftp://ftp1.mplayerhq.hu/MPlayer/releases/$SOURCE
SOURCE_URL[1]=ftp://ftp2.mplayerhq.hu/MPlayer/releases/$SOURCE
SOURCE_URL[2]=ftp://ftp5.mplayerhq.hu/MPlayer/releases/$SOURCE
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/MPlayer-$VERSION
SECURITY_PATCH=1
fi
WEB_SITE=http://www.mplayerhq.hu
LICENSE[0]=GPL
ENTERED=20010922
- UPDATED=20050420
DOCS="$DOCS etc/*.conf"
KEYWORDS="player video"
SHORT="MPlayer is a movie and animation player."
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index 109bfbb..612ab7e 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,9 @@
+2006-11-06 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to 1.0rc1. Removed UPDATED.
+ * DEPENDS: option for gtk+1, vorbis and faad updated.
+ * PRE_BUILD: Removed. Patch not needed.
+ * Makefile.patch: Removed. Font code already removed.
+
2006-06-21 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: options for vorbis and faad changed in svn

diff --git a/video/mplayer/MPlayer-1.0pre8.tar.bz2.sig
b/video/mplayer/MPlayer-1.0pre8.tar.bz2.sig
deleted file mode 100644
index 7ca900c..0000000
Binary files a/video/mplayer/MPlayer-1.0pre8.tar.bz2.sig and /dev/null differ
diff --git a/video/mplayer/MPlayer-1.0rc1.tar.bz2.sig
b/video/mplayer/MPlayer-1.0rc1.tar.bz2.sig
new file mode 100644
index 0000000..7feaeba
Binary files /dev/null and b/video/mplayer/MPlayer-1.0rc1.tar.bz2.sig differ
diff --git a/video/mplayer/Makefile.patch b/video/mplayer/Makefile.patch
deleted file mode 100644
index 197a820..0000000
--- a/video/mplayer/Makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile~ 2006-06-11 20:35:47.000000000 +0200
-+++ Makefile 2006-06-12 09:31:16.000000000 +0200
-@@ -471,11 +471,6 @@
- done
- endif
- @$(INSTALL) -d $(DATADIR)
-- @$(INSTALL) -d $(DATADIR)/font
-- @if test ! -f $(DATADIR)/font/font.desc ; then \
-- echo "*** Download font at http://www.mplayerhq.hu/dload.html"; ; \
-- echo "*** for OSD/Subtitles support and extract to $(DATADIR)/font/"
; \
-- fi
- ifeq ($(GUI),yes)
- @$(INSTALL) -d $(DATADIR)/skins
- @echo "*** Download skin(s) at http://www.mplayerhq.hu/dload.html";
diff --git a/video/mplayer/PRE_BUILD b/video/mplayer/PRE_BUILD
deleted file mode 100755
index f095b45..0000000
--- a/video/mplayer/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch Makefile $SCRIPT_DIRECTORY/Makefile.patch



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (c5caaf8a453cda5f1501c5fa5154da371b81a53d), George Sherwood, 11/06/2006

Archive powered by MHonArc 2.6.24.

Top of Page