Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (d43064d58e379942ac75c7655e30c42f3ec3b907)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (d43064d58e379942ac75c7655e30c42f3ec3b907)
  • Date: Sun, 5 Jan 2014 08:08:46 -0600

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

audio-libs/libmpdclient/DEPENDS | 6 +++++-
audio-libs/libmpdclient/DETAILS | 8 ++++----
audio-libs/libmpdclient/HISTORY | 4 ++++
audio-players/mpc/DETAILS | 8 ++++----
audio-players/mpc/HISTORY | 3 +++
audio-players/mpd/BUILD | 1 +
audio-players/mpd/DEPENDS | 11 +++++++----
audio-players/mpd/DETAILS | 4 ++--
audio-players/mpd/HISTORY | 7 +++++++
libs/libcdio/DETAILS | 2 +-
libs/libcdio/HISTORY | 3 +++
libs/openscenegraph/DEPENDS | 2 +-
libs/openscenegraph/DETAILS | 6 +++---
libs/openscenegraph/HISTORY | 5 +++++
libs/openscenegraph/PRE_BUILD | 3 ---
libs/openscenegraph/video_out_rgb.c.patch | 28 ----------------------------
video/mpv/BUILD | 4 ++--
video/mpv/DEPENDS | 16 +++++-----------
video/mpv/DETAILS | 4 ++--
video/mpv/HISTORY | 6 ++++++
20 files changed, 65 insertions(+), 66 deletions(-)

New commits:
commit d43064d58e379942ac75c7655e30c42f3ec3b907
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video/mpv: version 0.3.1

commit 102ee32cdff8f334ceb769a46777ff69515468d4
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/libcdio: version 0.92

commit 3ff14cfe18348fbc9f9644458c5576a97583a90b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

audio-players/mpd: version 0.18.6

commit 11dfac7b84a2f0e8e669fb3e73a5704d5fe8698e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/openscenegraph: version 3.2.0

commit b98847b8c227e98db7aff066c61437006ca62c86
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

audio-libs/libmpdclient: version 2.9

commit 05d74de842d56e6e23a2525057120a85525d173d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

audio-players/mpc: version 0.24

diff --git a/audio-libs/libmpdclient/DEPENDS b/audio-libs/libmpdclient/DEPENDS
index 5584a0a..4ae919c 100755
--- a/audio-libs/libmpdclient/DEPENDS
+++ b/audio-libs/libmpdclient/DEPENDS
@@ -1 +1,5 @@
-depends autoconf
+depends autoconf &&
+optional_depends doxygen \
+ "--enable-documentation" \
+ "--disable-documentation" \
+ "build API documentation"
diff --git a/audio-libs/libmpdclient/DETAILS b/audio-libs/libmpdclient/DETAILS
index 60d7a3c..0d834f8 100755
--- a/audio-libs/libmpdclient/DETAILS
+++ b/audio-libs/libmpdclient/DETAILS
@@ -1,9 +1,9 @@
SPELL=libmpdclient
- VERSION=2.7
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=2.9
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=$SOURCEFORGE_URL/musicpd/$SOURCE
-
SOURCE_HASH=sha512:e3f62646246495fa5bfc0df45c1f2aed4086040d429181c1da9796b9f7ea5789d34896273a1703c788fba9b08b11a6ac1376cb9514d33299a542b97eb4f6dc45
+ SOURCE_URL[0]=http://www.musicpd.org/download/libmpdclient/2/${SOURCE}
+
SOURCE_HASH=sha512:7e6af51e31a3319e6681dfe5199fda1b2c1482f6aa6854af7c7f02c999fbbeae4f369c9b157abf95402c7f022d155109454b243549185ba791df5b2457baaba4
WEB_SITE=http://mpd.wikia.com/wiki/ClientLib:libmpdclient
ENTERED=20091231
LICENSE[0]=GPL
diff --git a/audio-libs/libmpdclient/HISTORY b/audio-libs/libmpdclient/HISTORY
index 07a3813..bf89fd1 100644
--- a/audio-libs/libmpdclient/HISTORY
+++ b/audio-libs/libmpdclient/HISTORY
@@ -1,3 +1,7 @@
+2014-01-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.9
+ * DEPENDS: add optional dependency on doxygen
+
2012-02-15 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.7
* PRE_BUILD, Makefile.am.patch: removed
diff --git a/audio-players/mpc/DETAILS b/audio-players/mpc/DETAILS
index 1cc332c..6372915 100755
--- a/audio-players/mpc/DETAILS
+++ b/audio-players/mpc/DETAILS
@@ -1,10 +1,10 @@
SPELL=mpc
- VERSION=0.22
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=0.24
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=$SOURCEFORGE_URL/musicpd/$SOURCE
+ SOURCE_URL[0]=http://www.musicpd.org/download/mpc/0/${SOURCE}
WEB_SITE=http://www.musicpd.org
-
SOURCE_HASH=sha512:64492267e17ca33d4fd191ce0222011b6c807ad330aa877bafee83c3027d3a6e6f663f0c4aec96d5980777537f877f355f27605791bc8e61e51a20d74afaa4d1
+
SOURCE_HASH=sha512:c8d48060f7e2251c1eebe3f0d1d7a4f4ea44408b3741cefa88cc21b1c1f8a5560d3ec94a49f0c1563a5786e338a6b1267f1e2adfebf358234205b459692cceaf
LICENSE[0]=GPL
ENTERED=20040516
DOCS="AUTHORS COPYING ChangeLog README"
diff --git a/audio-players/mpc/HISTORY b/audio-players/mpc/HISTORY
index 44554b4..25f0cc8 100644
--- a/audio-players/mpc/HISTORY
+++ b/audio-players/mpc/HISTORY
@@ -1,3 +1,6 @@
+2014-01-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.24
+
2012-02-15 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.22; quoting paths

diff --git a/audio-players/mpd/BUILD b/audio-players/mpd/BUILD
index 8cbf700..5365ee6 100755
--- a/audio-players/mpd/BUILD
+++ b/audio-players/mpd/BUILD
@@ -1,5 +1,6 @@
create_account musicdaemon &&

OPTS="$MPD_OPTS $OPTS" &&
+OPTS="$OPTS --disable-mpc" &&

LDFLAGS+="-L/usr/lib/sidplay/builders" default_build
diff --git a/audio-players/mpd/DEPENDS b/audio-players/mpd/DEPENDS
index 6ca4799..8e5f012 100755
--- a/audio-players/mpd/DEPENDS
+++ b/audio-players/mpd/DEPENDS
@@ -53,10 +53,10 @@ optional_depends sidplay-libs \
"--disable-sidplay" \
"for C64 SID support" &&

-optional_depends libmpcdec \
- "--enable-mpc" \
- "--disable-mpc" \
- "for musepack support" &&
+#optional_depends libmpcdec \
+# "--enable-mpc" \
+# "--disable-mpc" \
+# "for musepack support" &&

optional_depends flac \
"--enable-flac" \
@@ -178,6 +178,9 @@ optional_depends LIBAVCODEC \
"--enable-ffmpeg" \
"--disable-ffmpeg" \
"for FFMPEG support" &&
+if is_depends_enabled $SPELL ffmpeg; then
+ sub_depends ffmpeg STABLE
+fi &&

optional_depends OPENAL \
"--enable-openal" \
diff --git a/audio-players/mpd/DETAILS b/audio-players/mpd/DETAILS
index 909d713..ab3c655 100755
--- a/audio-players/mpd/DETAILS
+++ b/audio-players/mpd/DETAILS
@@ -1,10 +1,10 @@
SPELL=mpd
- VERSION=0.17.5
+ VERSION=0.18.6
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.musicpd.org/download/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:b707ae8098f9b970be1b954c9a2e3bb1ae25d155a2b85331c2196c23bd9cb7c8512715748b765018445adff97bab511cab5c8e6f9cb3f51c7e8aedbcd20cc302
+
SOURCE_HASH=sha512:52db095942d2aa76ae77ac44347169df0265d7b1b20029e476ad4bb37f7f8c03a723f2a90c5e1b8de08edf658a621779f81a594e3e0eb9b474af85de4554cbef
LICENSE[0]=GPL
KEYWORDS="music players audio"
WEB_SITE=http://www.musicpd.org/
diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index 7ae1beff..0bf2695 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,3 +1,10 @@
+2014-01-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.18.6
+ * DEPENDS: depend on stable version of ffmpeg if ffmpeg is selected,
+ remove optional dependency on libmpcdec since our libmpcdec is
+ incompatible with mpd
+ * BUILD: forcibly disable dependency on libmpcdec to prevent build
error
+
2013-08-31 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: fix library search path so libresid-builder is found

diff --git a/libs/libcdio/DETAILS b/libs/libcdio/DETAILS
index f528ec6..fb28509 100755
--- a/libs/libcdio/DETAILS
+++ b/libs/libcdio/DETAILS
@@ -1,5 +1,5 @@
SPELL=libcdio
- VERSION=0.90
+ VERSION=0.92
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/libcdio/HISTORY b/libs/libcdio/HISTORY
index 50a7aae..6bf3edf 100644
--- a/libs/libcdio/HISTORY
+++ b/libs/libcdio/HISTORY
@@ -1,3 +1,6 @@
+2014-01-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.92
+
2013-02-24 Vlad Glagolev <stealth AT sourcemage.org>
* UP_TRIGGERS: added, for proper update process

diff --git a/libs/openscenegraph/DEPENDS b/libs/openscenegraph/DEPENDS
index 9edd465..3d48c25 100755
--- a/libs/openscenegraph/DEPENDS
+++ b/libs/openscenegraph/DEPENDS
@@ -12,7 +12,7 @@ depends libxrandr &&
depends tiff &&
depends unzip &&
depends zlib &&
-depends -sub LEGACY ffmpeg &&
+depends -sub STABLE ffmpeg &&
depends -sub CXX gcc &&
depends openexr

diff --git a/libs/openscenegraph/DETAILS b/libs/openscenegraph/DETAILS
index 3e901bf..e4e45e3 100755
--- a/libs/openscenegraph/DETAILS
+++ b/libs/openscenegraph/DETAILS
@@ -1,10 +1,10 @@
SPELL=openscenegraph
- VERSION=3.0.1
+ VERSION=3.2.0
BRANCH=${VERSION/%.?/}
SOURCE=OpenSceneGraph-$VERSION.zip
SOURCE_DIRECTORY=$BUILD_DIRECTORY/OpenSceneGraph-${VERSION}
-
SOURCE_URL[0]=http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$VERSION/source/$SOURCE
-
SOURCE_HASH=sha512:5fbfe9070721f055349a27516c9a20195070d13ab562e0c5109cc1f1d46dfaf09778152a14f5815b72728d315cb80b2d7bab747bfd9be58aea22d600c2c97912
+
SOURCE_URL[0]=http://www.openscenegraph.org/downloads/developer_releases/$SOURCE
+
SOURCE_HASH=sha512:9a270f2a0b5f8b0527fb99668da8771073c6469c5a403371a786da47df0443f6a5776716942f2318e7e58d9a41417b5dc5f4ae4a123cfcc72840e3d2999322bd
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
WEB_SITE=http://www.openscenegraph.org/
ENTERED=20021102
diff --git a/libs/openscenegraph/HISTORY b/libs/openscenegraph/HISTORY
index feedeef..35bf663 100644
--- a/libs/openscenegraph/HISTORY
+++ b/libs/openscenegraph/HISTORY
@@ -1,3 +1,8 @@
+2014-01-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.2.0
+ * DEPENDS: switch dependency on ffmpeg from legacy to stable
+ * PRE_BUILD, video_out_rgb.c.patch: removed obsolete patch
+
2012-12-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, video_out_rgb.c.patch: add patch from gentoo to fix
compile error with recent versions of xine-lib
diff --git a/libs/openscenegraph/PRE_BUILD b/libs/openscenegraph/PRE_BUILD
deleted file mode 100755
index f75bdda..0000000
--- a/libs/openscenegraph/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 < ${SPELL_DIRECTORY}/video_out_rgb.c.patch
diff --git a/libs/openscenegraph/video_out_rgb.c.patch
b/libs/openscenegraph/video_out_rgb.c.patch
deleted file mode 100644
index 86618de..0000000
--- a/libs/openscenegraph/video_out_rgb.c.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Adjust xine plugin in osg to driver class members used for xine-lib-1.2.0.
-
-2012-01-07 Martin von Gagern
-
-References:
-https://bugs.gentoo.org/397643
-http://anonscm.debian.org/hg/xine-lib/xine-lib-1.2/diff/806b590a4d38/src/xine-engine/video_out.h
-http://www.openscenegraph.org/projects/osg/browser/OpenSceneGraph/trunk/src/osgPlugins/xine
-
-Index: OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c
-===================================================================
---- OpenSceneGraph-3.0.1.orig/src/osgPlugins/xine/video_out_rgb.c
-+++ OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c
-@@ -2769,8 +2769,14 @@ init_class(xine_t* xine, void* vo_visual
- clear(rgb_class, sizeof(rgbout_class_t));
-
- rgb_class->driver_class.open_plugin = open_plugin;
-+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 &&
XINE_MINOR_VERSION < 2)
- rgb_class->driver_class.get_identifier = get_identifier;
- rgb_class->driver_class.get_description = get_description;
-+#else
-+ rgb_class->driver_class.identifier = get_identifier(NULL);
-+ rgb_class->driver_class.description = get_description(NULL);
-+#endif
-+
- rgb_class->driver_class.dispose = dispose_class;
-
- return(rgb_class);
diff --git a/video/mpv/BUILD b/video/mpv/BUILD
index 446e4c8..61399b2 100755
--- a/video/mpv/BUILD
+++ b/video/mpv/BUILD
@@ -18,8 +18,8 @@ if is_depends_enabled $SPELL $(get_spell_provider $SPELL
OPENGL); then
fi
fi &&

-./configure --prefix=${INSTALL_ROOT}/usr \
+./old-configure --prefix=${INSTALL_ROOT}/usr \
--confdir=${TRACK_ROOT}/etc/mpv \
$OPTS &&

-make V=1
+make V=1 -f old-makefile
diff --git a/video/mpv/DEPENDS b/video/mpv/DEPENDS
index 8d88105..c237624 100755
--- a/video/mpv/DEPENDS
+++ b/video/mpv/DEPENDS
@@ -15,12 +15,6 @@ optional_depends texlive \
# they don't exist; it breaks adding proper LDFLAGS and makes configure
# script choose bad decisions on dependencies

-# localization
-optional_depends gettext \
- "--enable-gettext" \
- "--disable-gettext" \
- "for native language support" &&
-
# audio output
optional_depends alsa-lib \
"" \
@@ -115,11 +109,6 @@ optional_depends libxscrnsaver \
"for screensaver support via xss" &&

# codecs
-optional_depends libmng \
- "--enable-mng" \
- "--disable-mng" \
- "for MNG input support" &&
-
optional_depends JPEG \
"--enable-jpeg" \
"--disable-jpeg" \
@@ -217,6 +206,11 @@ optional_depends libdvdread \
"--disable-dvdread" \
"for reading scrambled (CSS) DVDs" &&

+optional_depends libdvdnav \
+ "" \
+ "--disable-dvdnav" \
+ "for dvd navigation support" &&
+
optional_depends enca \
"" \
"--disable-enca" \
diff --git a/video/mpv/DETAILS b/video/mpv/DETAILS
index 0d37318..7d0ac27 100755
--- a/video/mpv/DETAILS
+++ b/video/mpv/DETAILS
@@ -1,10 +1,10 @@
SPELL=mpv
- VERSION=0.2.4
+ VERSION=0.3.1
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCEX=v${VERSION}.tar.gz

SOURCE_URL[0]=https://github.com/${SPELL}-player/${SPELL}/archive/${SOURCEX}
SOURCE_HINTS="no-check-certificate"
-
SOURCE_HASH=sha512:72214d02fc459b1789831e54de2841ff0a8d83c97f1ba76b18d31e970372571569b45a036fe7e7e67d6fa9460f73216cc0f1e1e6149cb24a99c490d5cdfb5ec1
+
SOURCE_HASH=sha512:55415fffdb4a6a9b0012f7c6efa2b665fbead12e1c511c6c4bd15bdba8ae0f5ee6b8183ef82cebb1cbb9e48dcd59d72913a7cfb3b408dc1db6fdc79dec0c20ab
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
DOCS="Copyright DOCS/tech-overview.txt DOCS/OUTDATED-tech/*
$DOCS"
WEB_SITE=http://mpv.io/
diff --git a/video/mpv/HISTORY b/video/mpv/HISTORY
index effc568..7d1e178 100644
--- a/video/mpv/HISTORY
+++ b/video/mpv/HISTORY
@@ -1,3 +1,9 @@
+2014-01-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.3.1
+ * BUILD: use legacy configure script and Makefile
+ * DEPENDS: remove optional dependencies on gettext, libmng,
+ add optional dependency on libdvdnav
+
2013-12-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.2.4




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (d43064d58e379942ac75c7655e30c42f3ec3b907), Florian Franzmann, 01/05/2014

Archive powered by MHonArc 2.6.24.

Top of Page