Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (3e7060e20d2a6799a5ee445d630ebab18f02cd40)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (3e7060e20d2a6799a5ee445d630ebab18f02cd40)
  • Date: Mon, 22 Mar 2010 15:20:16 -0500

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

audio-creation/ardour2/DETAILS | 4 -
audio-creation/ardour2/HISTORY | 3
audio-drivers/jack2/DETAILS | 4 -
audio-drivers/jack2/HISTORY | 3
audio-drivers/libffado/DETAILS | 4 -
audio-drivers/libffado/HISTORY | 3
audio-players/audacious/DETAILS | 4 -
audio-players/audacious/HISTORY | 3
audio-players/mpg123/BUILD | 10 ++-
audio-players/mpg123/DETAILS | 2
audio-players/mpg123/HISTORY | 7 +-
audio-players/mpg123/INSTALL | 6 +
audio-players/mpg123/UP_TRIGGERS | 21 ++++++
audio-players/xmms2/HISTORY | 5 +
audio-players/xmms2/PRE_BUILD | 5 +
audio-players/xmms2/xmms2-0.6_and_0.7_mpg123-wscript | 58
+++++++++++++++++++
audio-plugins/audacious-plugins/DEPENDS | 2
audio-plugins/audacious-plugins/DETAILS | 4 -
audio-plugins/audacious-plugins/HISTORY | 4 +
audio-soft/qjackctl/DETAILS | 4 -
audio-soft/qjackctl/HISTORY | 3
x11-libs/wine/DEPENDS | 9 ++
x11-libs/wine/HISTORY | 3
x11-libs/wine/PRE_BUILD | 10 +++
x11-libs/wine/wine-1.1.41-mpg123_64.diff | 32 ++++++++++
x11-libs/wine/wine-git-mpg123_64.diff | 30 +++++++++
26 files changed, 225 insertions(+), 18 deletions(-)

New commits:
commit a8aa51c310e4c619ebb6573f8712117b85d16d5b
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

audacious: bump to 2.1

commit c9a632012a6f84d2b9b72847ae961152a975c35d
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

audacious-plugins: add warning about jack2

commit d4b3e7a8f1d77056a0ebaa9d8da9dc237ee4189f
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

audacious-plugins: update to 2.1

commit 90ce0840b9bc575a92160a11fd9d9dbb9c48502d
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

wine: prepare for mpg123-1.11.0

commit fd7bb4f8a7436c63adb33a26412137e36b544387
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

qjackctl: update to 0.3.5

commit 93302361ab5e3a7f0a0b7ae2ecb3564b44d80182
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

libffado: update to release 2.0

commit 86b0371dbc7c0e0b5bd785597ee73084cc820d58
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

jack2: update to 1.9.4

commit 11be09dd62243d8c64e19d61281160b907727dab
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

ardour2: update to 2.8.7

commit 8b7eabb241ca8712e15b5344e27b3504d3769e83
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

xmms2: fix build with mpg123 1.11.0

commit c1a50056bd2d33cebff54ec1880011915fca82f1
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

mpg123: bump to 1.11, with dual libraries for large/small files

diff --git a/audio-creation/ardour2/DETAILS b/audio-creation/ardour2/DETAILS
index 0796f1f..69e0ff0 100755
--- a/audio-creation/ardour2/DETAILS
+++ b/audio-creation/ardour2/DETAILS
@@ -1,6 +1,6 @@
SPELL=ardour2
- VERSION=2.8.4
-
SOURCE_HASH=sha512:27918dce9c470b4e245b9c8529e0d3dc69d7f425e3b701f4ac67124e1b4185321d2cb627f65fc7dfd03f32477ba4fad499395a85c00f55824fea54f92b721d1b
+ VERSION=2.8.7
+
SOURCE_HASH=sha512:f27f3c8c77e2e8cb2eb6b5f4a79b66749157a40b3d7f125df150572af98051304d15e5fade54cdd85551a832f2e65e7046fba574176e35ec8be8b1865629d229
SOURCE=ardour-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/ardour-$VERSION"
# that does not work anymore... they want to force manual downloads:-(
diff --git a/audio-creation/ardour2/HISTORY b/audio-creation/ardour2/HISTORY
index bbfbc9d..2f7ce1a 100644
--- a/audio-creation/ardour2/HISTORY
+++ b/audio-creation/ardour2/HISTORY
@@ -1,3 +1,6 @@
+2010-02-08 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: updated spell to 2.8.7
+
2009-11-20 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: update to 2.8.4

diff --git a/audio-drivers/jack2/DETAILS b/audio-drivers/jack2/DETAILS
index 9805ff0..eef8c60 100755
--- a/audio-drivers/jack2/DETAILS
+++ b/audio-drivers/jack2/DETAILS
@@ -11,10 +11,10 @@ if [[ $JACK2_VCS == y ]]; then
FORCE_DOWNLOAD=1
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
else
- VERSION=1.9.3
+ VERSION=1.9.4
SOURCE=jack-$VERSION.tar.bz2
SOURCE_URL[0]=http://www.grame.fr/~letz/$SOURCE
-
SOURCE_HASH=sha512:b276f7f430bae1b8ca7dad917202a95527efcba5eb6e73f579921aee54e0c7e0b3bf2dcf04a0f252e1b175f15326c306639c9fdb95e89b3513f775c25af24891
+
SOURCE_HASH=sha512:e959fff2ad6bffb3544965139d61cbcfee163e3ff7d7e3483020901b5c88d9735a4c22ec2cff388c59019d03cdfb3aee51cb4274a3fa0f89ed340f3443144f6a
SOURCE_DIRECTORY="$BUILD_DIRECTORY/jack-$VERSION"
fi
WEB_SITE=http://jackaudio.org/
diff --git a/audio-drivers/jack2/HISTORY b/audio-drivers/jack2/HISTORY
index e405b1c..d540f87 100644
--- a/audio-drivers/jack2/HISTORY
+++ b/audio-drivers/jack2/HISTORY
@@ -1,3 +1,6 @@
+2010-02-08 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: updated spell to 1.9.4
+
2009-08-01 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: updated spell to 1.9.3
* DEPENDS: switch between classic and dbus, explicitly
diff --git a/audio-drivers/libffado/DETAILS b/audio-drivers/libffado/DETAILS
index 90b38be..3f81f15 100755
--- a/audio-drivers/libffado/DETAILS
+++ b/audio-drivers/libffado/DETAILS
@@ -11,10 +11,10 @@ if [[ "$FFADO_VCS" == y ]]; then
FORCE_DOWNLOAD=1
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
else
- VERSION=2.0-rc2
+ VERSION=2.0.0
SOURCE="$SPELL-$VERSION.tar.gz"
SOURCE_URL="http://www.ffado.org/files/$SOURCE";
-
SOURCE_HASH=sha512:ba5444621bc82d03b53f71f987430975f204decfbf635128b4e070bce93e9f70a2301bcea21205bf5538ad29f93422607fed9129f9589462b2ac0a5b28353341
+
SOURCE_HASH=sha512:799e8cb8030ed1f0e152d9b0dbc3e450be3d6d0e600b7798c435241266ea416a6ff94ede31dab33eaefccf16c91901576bc3caad4f8616a78ce6449d33edc046
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
fi
WEB_SITE=http://www.ffado.org
diff --git a/audio-drivers/libffado/HISTORY b/audio-drivers/libffado/HISTORY
index 90d3f07..061f0f7 100644
--- a/audio-drivers/libffado/HISTORY
+++ b/audio-drivers/libffado/HISTORY
@@ -1,3 +1,6 @@
+2020-02-08 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: Update to release version 2.0.0 .
+
2009-08-01 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS, PREPARE: Added new release candidate as "stable" version,
svn as option; no testing on alpha: that patch may vanish...
diff --git a/audio-players/audacious/DETAILS b/audio-players/audacious/DETAILS
index f47d1c0..4807202 100755
--- a/audio-players/audacious/DETAILS
+++ b/audio-players/audacious/DETAILS
@@ -1,8 +1,8 @@
SPELL=audacious
- VERSION=1.5.1
+ VERSION=2.1
SOURCE=${SPELL}-${VERSION}.tgz
SOURCE_URL[0]=http://distfiles.atheme.org/${SOURCE}
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_HASH=sha512:69c67ace492332cf5cb383efe5e115399a509aba3607e00c67f0d47c0b152ff8e7f14a2c380c104fa2b400ddb859883a0d459966d3731498df8ab9add9e7ebad
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE="http://audacious-media-player.org";
LICENSE[0]=GPL
diff --git a/audio-players/audacious/HISTORY b/audio-players/audacious/HISTORY
index 7eef940..a5b074d 100644
--- a/audio-players/audacious/HISTORY
+++ b/audio-players/audacious/HISTORY
@@ -1,3 +1,6 @@
+2010-03-22 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: update to 2.1
+
2008-06-26 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: updated to 1.5.1
* DEPENDS: changed flac enable switch; added pango, cairo, pcre
diff --git a/audio-players/mpg123/BUILD b/audio-players/mpg123/BUILD
index a91b861..52568b9 100755
--- a/audio-players/mpg123/BUILD
+++ b/audio-players/mpg123/BUILD
@@ -4,5 +4,13 @@ fi &&
if [[ "$MPG123_SEEKTABLE" != "" ]]; then
OPTS="--with-seektable=$MPG123_SEEKTABLE $OPTS"
fi &&
-OPTS="$MPG123_MODULES $OPTS"
+OPTS="$MPG123_MODULES $OPTS" &&
+if [[ ${SMGL_COMPAT_ARCHS[0]} == 32 ]]; then
+ # Installing both libmpg123 and libmpg123_64, as recommended by upstream
(yes, that's me;-).
+ message "${MESSAGE_COLOR}Preparing dual build for providing libmpg123 for
small and large files.$DEFAULT_COLOR"
+ OPTS="$OPTS --disable-modules --disable-largefile" default_build &&
+ make DESTDIR="$SOURCE_DIRECTORY/mpg123-smallfile" install # Will grab the
library build later from there.
+fi &&
+# Sane systems, in this case 64 bit Linux, just need default build.
+# On 32 bit systems, default build will enable largefile support for
libmpg123_64
default_build
diff --git a/audio-players/mpg123/DETAILS b/audio-players/mpg123/DETAILS
index 1a0f7f7..e809c94 100755
--- a/audio-players/mpg123/DETAILS
+++ b/audio-players/mpg123/DETAILS
@@ -1,5 +1,5 @@
SPELL=mpg123
- VERSION=1.10.1
+ VERSION=1.11.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/audio-players/mpg123/HISTORY b/audio-players/mpg123/HISTORY
index f0662db..597e84e 100644
--- a/audio-players/mpg123/HISTORY
+++ b/audio-players/mpg123/HISTORY
@@ -1,4 +1,9 @@
-2009-02-27 Thomas Orgis <sobukus AT sourcemage.org>
+2010-03-22 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS, BUILD, INSTALL: bump to 1.11.0, installing libmpg123.so
+ and libmpg123_64.so for large file support
+ * UP_TRIGGERS: trigger recast of dependendees for changed library name
+
+2010-02-27 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: bump to 1.10.1

2009-12-05 Thomas Orgis <sobukus AT sourcemage.org>
diff --git a/audio-players/mpg123/INSTALL b/audio-players/mpg123/INSTALL
new file mode 100755
index 0000000..732c6e6
--- /dev/null
+++ b/audio-players/mpg123/INSTALL
@@ -0,0 +1,6 @@
+cd "$SOURCE_DIRECTORY" &&
+if [[ ${SMGL_COMPAT_ARCHS[0]} == 32 ]]; then
+ cp -av mpg123-smallfile/$INSTALL_ROOT/usr/lib/libmpg123*
"$INSTALL_ROOT/usr/lib" &&
+ cp -av mpg123-smallfile/$INSTALL_ROOT/usr/lib/pkgconfig/libmpg123.pc
"$INSTALL_ROOT/usr/lib/pkgconfig"
+fi &&
+default_install
diff --git a/audio-players/mpg123/UP_TRIGGERS
b/audio-players/mpg123/UP_TRIGGERS
new file mode 100755
index 0000000..a292e97
--- /dev/null
+++ b/audio-players/mpg123/UP_TRIGGERS
@@ -0,0 +1,21 @@
+# On x86, if there is mpg123 >= 1.5 but < 1.11 installed, it will have
libmpg123.so with 64bit off_t.
+# Since 1.11, libmpg123.so offers 32 bit off_t, consistent with pre-1.5
versions,
+# plus additional libmpg123_64.so for 64 bit offsets.
+local OLD_SPELL_VERSION=""
+local MAJOR=""
+local MINOR=""
+if [[ ${SMGL_COMPAT_ARCHS[0]} == 32 ]] && spell_ok $SPELL; then
+ OLD_SPELL_VERSION="$(installed_version $SPELL)"
+ MAJOR=$(echo $OLD_SPELL_VERSION | cut -d . -f 1)
+ MINOR=$(echo $OLD_SPELL_VERSION | cut -d . -f 2)
+ if [[ $MAJOR -eq 1 ]] && [[ $MINOR -ge 5 ]] && [[ $MINOR -lt 11 ]]; then
+ message "This is a possibly incompatible update of libmpg123..."
+ message "Figuring out what spells need to be recast, this may take a
while."
+ for each in $(show_up_depends $SPELL); do
+ if gaze install $each | xargs readelf -d 2> /dev/null |
+ grep -q "NEEDED.*libmpg123.so.0"; then
+ up_trigger $each cast_self
+ fi
+ done
+ fi
+fi
diff --git a/audio-players/xmms2/HISTORY b/audio-players/xmms2/HISTORY
index d0243d2..04aa417 100644
--- a/audio-players/xmms2/HISTORY
+++ b/audio-players/xmms2/HISTORY
@@ -1,3 +1,8 @@
+2010-03-22 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, xmms2-0.6_and_0.7_mpg123-wscript:
+ prepared for mpg123 1.11.0
+ ... hopefully to be removed on next release.
+
2010-03-01 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: updated to 0.7DrNo
* DEPENDS: gme now needs a dependency
diff --git a/audio-players/xmms2/PRE_BUILD b/audio-players/xmms2/PRE_BUILD
index d01d3d2..a63f571 100755
--- a/audio-players/xmms2/PRE_BUILD
+++ b/audio-players/xmms2/PRE_BUILD
@@ -4,4 +4,7 @@ unpack_file &&
cd xmms* &&
echo -e "#!/bin/sh\ncd xmms*\n./waf configure --help" > ../configure &&
chmod +x ../configure &&
-patch -p0 < $SPELL_DIRECTORY/fix_flags.diff
+patch -p0 < $SPELL_DIRECTORY/fix_flags.diff &&
+# Be prepared for mpg123 >= 1.11.0, needed at least until xmms2 0.7
+cp -v "$SCRIPT_DIRECTORY/xmms2-0.6_and_0.7_mpg123-wscript"
src/plugins/mpg123/wscript
+
diff --git a/audio-players/xmms2/xmms2-0.6_and_0.7_mpg123-wscript
b/audio-players/xmms2/xmms2-0.6_and_0.7_mpg123-wscript
new file mode 100644
index 0000000..324969d
--- /dev/null
+++ b/audio-players/xmms2/xmms2-0.6_and_0.7_mpg123-wscript
@@ -0,0 +1,58 @@
+from waftools.plugin import plugin
+
+def getlfsflags():
+ import os
+ # ask python for lfs flags, this fails on Windows and Mac OS
+ # windows needs some special care, and Mac OS X alwas uses 64 bit for
+ # off_t so we shouldn't be here anyway
+ try:
+ lfsflags = os.confstr (os.confstr_names['CS_LFS_CFLAGS']).split ()
+ # If os.confstr of 'CS_LFS_CFLAGS' is not supported, try with some
+ # default values
+ except KeyError:
+ # Mac OS X and probably other unices end here
+ lfsflags = ['-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']
+ except AttributeError:
+ # Windows ends up here
+ lfsflags = ['-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']
+
+ return lfsflags
+
+def plugin_configure(conf):
+ # Minimum libmpg123 version for xmms2 is 1.5.1 ... versions up to 1.10.1
can use 32 and 64 bit offsets.
+ # Beginning with 1.11.0, libmpg123 will always use the default file
offset width,
+ # while on platforms that have optional large file support there can be
libmpg123_64 using 64 bits offset.
+ if conf.check_cfg(package="libmpg123_64", atleast_version="1.11.0",
uselib_store="mpg123", args="--cflags --libs"):
+ # When we got libmpg123_64, it is reasonable to assume that lfsflags
will work out.
+ conf.env['CCFLAGS_mpg123'] += getlfsflags()
+ return True
+ else:
+ # Any other libmpg123 >= 1.11.0 is guaranteed to work with default
off_t.
+ if conf.check_cfg(package="libmpg123", atleast_version="1.11.0",
uselib_store="mpg123", args="--cflags --libs"):
+ return True
+ else:
+ # Legacy mpg123 versions can be either large or small file-ish.
+ # One could delete that branch after some time ... when deciding
that mpg123 1.11.0 is widespread enough.
+ if not conf.check_cfg(package="libmpg123",
atleast_version="1.5.1", uselib_store="mpg123", args="--cflags --libs"):
+ return False
+
+ # A little pitfall: mpg123 1.10.1 will always succeed the simple
header check,
+ # even if the size of off_t does not match the installed lib.
+ # We'd need a real test program linking to the lib, calling
mpg123_open(NULL, "blabla"), for example.
+ if not conf.check_cc(header_name='mpg123.h', uselib='mpg123',
+ errmsg='failed',
+ msg='Testing mpg123 with default off_t'):
+ lfsflags = getlfsflags()
+ if not conf.check_cc(header_name='mpg123.h', uselib='mpg123',
+ cflags=lfsflags, errmsg='failed',
+ msg='Testing mpg123 with large off_t'):
+ return False
+
+ conf.env['CCFLAGS_mpg123'] += lfsflags
+
+ return True
+
+
+configure, build = plugin("mpg123", configure=plugin_configure,
+ source=["mpg123.c", "id3v1.c"], libs=["mpg123"])
+
diff --git a/audio-plugins/audacious-plugins/DEPENDS
b/audio-plugins/audacious-plugins/DEPENDS
index 7d04a2d..d53f989 100755
--- a/audio-plugins/audacious-plugins/DEPENDS
+++ b/audio-plugins/audacious-plugins/DEPENDS
@@ -25,7 +25,7 @@ optional_depends pulseaudio \
optional_depends JACK-DRIVER \
"" \
"--disable-jack" \
- "support for jack" &&
+ "support for jack (note: jack2 may not work here yet!)" &&
optional_depends arts \
"" \
"--disable-arts" \
diff --git a/audio-plugins/audacious-plugins/DETAILS
b/audio-plugins/audacious-plugins/DETAILS
index bde5e6a..d5cf50b 100755
--- a/audio-plugins/audacious-plugins/DETAILS
+++ b/audio-plugins/audacious-plugins/DETAILS
@@ -1,8 +1,8 @@
SPELL=audacious-plugins
- VERSION=1.5.1
+ VERSION=2.1
SOURCE=${SPELL}-${VERSION}.tgz
SOURCE_URL[0]=http://distfiles.atheme.org/${SOURCE}
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_HASH=sha512:41c938804b0110243a191814a65f672076b4a12a2f1b472b26bba3688532fdf7274c914543682c386b3d9773967009cfd2c43ca177b5f836064f526ee76717c1
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE="http://audacious-media-player.org";
LICENSE[0]=GPL
diff --git a/audio-plugins/audacious-plugins/HISTORY
b/audio-plugins/audacious-plugins/HISTORY
index b00e797..57a4a77 100644
--- a/audio-plugins/audacious-plugins/HISTORY
+++ b/audio-plugins/audacious-plugins/HISTORY
@@ -1,3 +1,7 @@
+2010-03-22 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: update to 2.1
+ * DEPENDS: Note: not really compatible with jack2, yet.
+
2009-06-14 Arjan Bouter <abouter AT sourcemage.org>
* BUILD, CONFIGURE: made ipv6 ,statusicon and
(composite-)osd optional
diff --git a/audio-soft/qjackctl/DETAILS b/audio-soft/qjackctl/DETAILS
index 8e45103..5fcd51e 100755
--- a/audio-soft/qjackctl/DETAILS
+++ b/audio-soft/qjackctl/DETAILS
@@ -13,11 +13,11 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-cvs"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=0.3.4
+ VERSION=0.3.5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:a31e32ba1286fe6d4136ca3fb5c03b48aa9905fe507d8a29ee52110ebd8ccb585040b8c1af4816b896fdcb12e54df6ac0413a0ac9688f1857f32283d218e98fe
+
SOURCE_HASH=sha512:f6ad2ae22ca4101c9f1f72ebb68a04b70c5a8595c4fc75a67b1f6d2799ab996dc216a361bb0e3daab31dd3d0eb4287f06a35b8d11354316458a6ab89ca34c77c

fi
WEB_SITE=http://qjackctl.sf.net
diff --git a/audio-soft/qjackctl/HISTORY b/audio-soft/qjackctl/HISTORY
index 72647ee..10843d4 100644
--- a/audio-soft/qjackctl/HISTORY
+++ b/audio-soft/qjackctl/HISTORY
@@ -1,3 +1,6 @@
+2010-03-22 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: update to 0.3.5
+
2009-08-07 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: update to 0.3.4

diff --git a/x11-libs/wine/DEPENDS b/x11-libs/wine/DEPENDS
index 68a1b3b..5902960 100755
--- a/x11-libs/wine/DEPENDS
+++ b/x11-libs/wine/DEPENDS
@@ -175,4 +175,11 @@ suggest_depends 'wine-gecko' \
optional_depends mpg123 \
'--with-mpg123' \
'--without-mpg123' \
- 'for MP3 decoding support'
+ 'for MP3 decoding support' &&
+
+# To be removed once the git tree deals with mpg123 1.11, see configure
patch.
+if test "$WINE_VCS" == y -o "$WINE_DEVEL" == y &&
+ [[ ${SMGL_COMPAT_ARCHS[0]} == 32 ]] && is_depends_enabled $SPELL mpg123;
then
+ depends autoconf &&
+ depends automake
+fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 146975c..cd2673c 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2010-03-22 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS, PRE_BUILD, *-mpg123_64.diff: Prepare build for mpg123
1.11.0 .
+
2010-03-19 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.1.41

diff --git a/x11-libs/wine/PRE_BUILD b/x11-libs/wine/PRE_BUILD
index 8a6b87b..eb5352c 100755
--- a/x11-libs/wine/PRE_BUILD
+++ b/x11-libs/wine/PRE_BUILD
@@ -3,4 +3,14 @@ default_pre_build &&
if [[ "$WINE_DEVEL" == "n" ]]; then
patch $SOURCE_DIRECTORY/dlls/gdi32/freetype.c \
$SCRIPT_DIRECTORY/freetype2-2.3.8-winebug-17024.patch
+fi &&
+if test "$WINE_VCS" == y -o "$WINE_DEVEL" == y &&
+ [[ ${SMGL_COMPAT_ARCHS[0]} == 32 ]] && is_depends_enabled $SPELL mpg123;
then
+ cd $SOURCE_DIRECTORY &&
+ if [[ "$WINE_DEVEL" == y ]]; then
+ patch -Np0 < "$SCRIPT_DIRECTORY/wine-1.1.41-mpg123_64.diff"
+ else
+ patch -Np1 < "$SCRIPT_DIRECTORY/wine-git-mpg123_64.diff"
+ fi &&
+ autoreconf -iv
fi
diff --git a/x11-libs/wine/wine-1.1.41-mpg123_64.diff
b/x11-libs/wine/wine-1.1.41-mpg123_64.diff
new file mode 100644
index 0000000..856a1bc
--- /dev/null
+++ b/x11-libs/wine/wine-1.1.41-mpg123_64.diff
@@ -0,0 +1,32 @@
+--- configure.ac.orig 2010-03-19 19:02:16.000000000 +0000
++++ configure.ac 2010-03-22 15:59:20.255872817 +0000
+@@ -1459,13 +1459,22 @@
+ [libpng ${notice_platform}development files not found, PNG
won't be supported.])
+
+ dnl **** Check for mpg123 ****
+-if test "$ac_cv_header_mpg123_h" = "yes"
+-then
+- AC_CHECK_LIB(mpg123,mpg123_feed,[AC_SUBST(LIBMPG123,"-lmpg123")])
+-fi
+-WINE_NOTICE_WITH(mpg123,[test "x$ac_cv_lib_mpg123_mpg123_feed" != xyes -a
x"$ac_cv_header_CoreAudio_CoreAudio_h" != xyes],
+- [libmpg123 ${notice_platform}development files not found
(or too old), mp3 codec won't be supported.])
+-test "x$ac_cv_lib_mpg123_mpg123_feed" = xyes -o
"x$ac_cv_func_AudioFileStreamOpen" = xyes ||
enable_winemp3_acm=${enable_winemp3_acm:-no}
++dnl Because of the largefile mess, look out for both libmpg123_64 and
libmpg123.
++dnl Note: One might also use pkg-config, both lib variants have defs for
that.
++ if test "$ac_cv_header_mpg123_h" = "yes"
++ then
++ have_libmpg123=no
++ AC_CHECK_LIB(mpg123_64,mpg123_feed,[
++ AC_SUBST(LIBMPG123,"-lmpg123_64")
++ have_libmpg123=yes],
++ [
++ AC_CHECK_LIB(mpg123,mpg123_feed,[AC_SUBST(LIBMPG123,"-lmpg123")
++ have_libmpg123=yes])
++ ])
++ fi
++WINE_NOTICE_WITH(mpg123,[test "x$have_libmpg123" != xyes -a
x"$ac_cv_header_CoreAudio_CoreAudio_h" != xyes],
++ [libmpg123 ${notice_platform}development files not found
(or too old), mp3 codec won't be supported.])
++test "x$have_libmpg123" = xyes -o "x$ac_cv_func_AudioFileStreamOpen" = xyes
|| enable_winemp3_acm=${enable_winemp3_acm:-no}
+
+ dnl **** Check for OpenAL 1.1 ****
+ if test "$ac_cv_header_AL_al_h" = "yes"
diff --git a/x11-libs/wine/wine-git-mpg123_64.diff
b/x11-libs/wine/wine-git-mpg123_64.diff
new file mode 100644
index 0000000..f8a9d99
--- /dev/null
+++ b/x11-libs/wine/wine-git-mpg123_64.diff
@@ -0,0 +1,30 @@
+diff --git a/configure.ac b/configure.ac
+index 1431a33..e4fcaf6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1459,13 +1459,22 @@ WINE_WARNING_WITH(png,[test "x$ac_cv_lib_soname_png"
= "x"],
+ [libpng ${notice_platform}development files not found, PNG
won't be supported.])
+
+ dnl **** Check for mpg123 ****
++dnl Because of the largefile mess, look out for both libmpg123_64 and
libmpg123.
++dnl Note: One might also use pkg-config, both lib variants have defs for
that.
+ if test "$ac_cv_header_mpg123_h" = "yes"
+ then
+- AC_CHECK_LIB(mpg123,mpg123_feed,[AC_SUBST(LIBMPG123,"-lmpg123")])
++ have_libmpg123=no
++ AC_CHECK_LIB(mpg123_64,mpg123_feed,[
++ AC_SUBST(LIBMPG123,"-lmpg123_64")
++ have_libmpg123=yes],
++ [
++ AC_CHECK_LIB(mpg123,mpg123_feed,[AC_SUBST(LIBMPG123,"-lmpg123")
++ have_libmpg123=yes])
++ ])
+ fi
+-WINE_NOTICE_WITH(mpg123,[test "x$ac_cv_lib_mpg123_mpg123_feed" != xyes -a
x"$ac_cv_header_CoreAudio_CoreAudio_h" != xyes],
++WINE_NOTICE_WITH(mpg123,[test "x$have_libmpg123" != xyes -a
x"$ac_cv_header_CoreAudio_CoreAudio_h" != xyes],
+ [libmpg123 ${notice_platform}development files not found
(or too old), mp3 codec won't be supported.])
+-test "x$ac_cv_lib_mpg123_mpg123_feed" = xyes -o
"x$ac_cv_func_AudioFileStreamOpen" = xyes ||
enable_winemp3_acm=${enable_winemp3_acm:-no}
++test "x$have_libmpg123" = xyes -o "x$ac_cv_func_AudioFileStreamOpen" = xyes
|| enable_winemp3_acm=${enable_winemp3_acm:-no}
+
+ dnl **** Check for OpenAL 1.1 ****
+ if test "$ac_cv_header_AL_al_h" = "yes"



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (3e7060e20d2a6799a5ee445d630ebab18f02cd40), Thomas Orgis, 03/22/2010

Archive powered by MHonArc 2.6.24.

Top of Page