Source Mage code commit list

[Thomas Orgis <scm AT sourcemage.org>]

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

 audio-players/mpg123/BUILD       |    8 --------
 audio-players/mpg123/DETAILS     |    2 +-
 audio-players/mpg123/HISTORY     |    4 ++++
 audio-players/mpg123/INSTALL     |    6 ------
 audio-players/mpg123/UP_TRIGGERS |   13 ++++++++-----
 audio-players/xmms2/HISTORY      |    5 +++++
 audio-players/xmms2/PRE_BUILD    |    7 ++++---
 x11-libs/wine/HISTORY            |    5 +++++
 x11-libs/wine/PRE_BUILD          |    4 +++-
 9 files changed, 30 insertions(+), 24 deletions(-)

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

    mpg123: update to 1.12.1 .

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

    xmms2: Only use the hacked mpg123 wscript for mpg123 1.11.0 .

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

    wine: Only apply the patch for mpg123 1.11.0, newer versions don't need 
it.

diff --git a/audio-players/mpg123/BUILD b/audio-players/mpg123/BUILD
index 52568b9..0dc6fef 100755
--- a/audio-players/mpg123/BUILD
+++ b/audio-players/mpg123/BUILD
@@ -5,12 +5,4 @@ if [[ "$MPG123_SEEKTABLE" != "" ]]; then
   OPTS="--with-seektable=$MPG123_SEEKTABLE $OPTS" 
 fi &&
 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 e809c94..327f992 100755
--- a/audio-players/mpg123/DETAILS
+++ b/audio-players/mpg123/DETAILS
@@ -1,5 +1,5 @@
            SPELL=mpg123
-         VERSION=1.11.0
+         VERSION=1.12.1
           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 71f420c..128f681 100644
--- a/audio-players/mpg123/HISTORY
+++ b/audio-players/mpg123/HISTORY
@@ -1,3 +1,7 @@
+2010-04-02 Thomas Orgis <sobukus AT sourcemage.org>
+       * DETAILS, BUILD: Update to 1.12.1
+       * INSTALL: gone (special install hack not needed anymore)
+
 2010-03-24 Thomas Orgis <sobukus AT sourcemage.org>
        * INSTALL: Use cp -P --preserve=links instead of cp -a to work around 
castfs bug.
 
diff --git a/audio-players/mpg123/INSTALL b/audio-players/mpg123/INSTALL
deleted file mode 100755
index b051928..0000000
--- a/audio-players/mpg123/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-cd "$SOURCE_DIRECTORY" &&
-if [[ ${SMGL_COMPAT_ARCHS[0]} == 32 ]]; then
-  cp -v -P --preserve=links  
mpg123-smallfile/$INSTALL_ROOT/usr/lib/libmpg123* "$INSTALL_ROOT/usr/lib" &&
-  cp -v 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
index a292e97..9fbcecd 100755
--- a/audio-players/mpg123/UP_TRIGGERS
+++ b/audio-players/mpg123/UP_TRIGGERS
@@ -1,6 +1,8 @@
-# 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.
+# For a very brief period, there was mpg123 1.11.0 with the split of 
libmpg123
+# for 32 bit file offsets and and libmpg123_64 for 64 bit offsets.
+# 1.12.0 introduces a dualmode library instead, replacing the split ones and
+# being binary compatible with all earlier libmpg123 versions (be it for 32 
or 64 bit offsets).
+# So only when updating from 1.11.0, we might need to recast users of 
libmpg123_64 .
 local OLD_SPELL_VERSION=""
 local MAJOR=""
 local MINOR=""
@@ -8,12 +10,13 @@ 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
+  if [[ $MAJOR -eq 1 ]] && [[ $MINOR -eq 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
+message "Checking $each."
       if gaze install $each | xargs readelf -d 2> /dev/null |
-         grep -q "NEEDED.*libmpg123.so.0"; then
+         grep -q "NEEDED.*libmpg123_64.so.0"; then
            up_trigger $each cast_self
       fi
     done
diff --git a/audio-players/xmms2/HISTORY b/audio-players/xmms2/HISTORY
index 04aa417..9f4e461 100644
--- a/audio-players/xmms2/HISTORY
+++ b/audio-players/xmms2/HISTORY
@@ -1,3 +1,8 @@
+2010-04-02 Thomas Orgis <sobukus AT sourcemage.org>
+       * PRE_BUILD: Only apply the wscript for mpg123 1.11.0 .
+         This is subject to removal once we are sure that this version
+         of mpg123 is history...
+
 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
diff --git a/audio-players/xmms2/PRE_BUILD b/audio-players/xmms2/PRE_BUILD
index a63f571..b7586d2 100755
--- a/audio-players/xmms2/PRE_BUILD
+++ b/audio-players/xmms2/PRE_BUILD
@@ -5,6 +5,7 @@ cd xmms*                         &&
 echo -e "#!/bin/sh\ncd xmms*\n./waf configure --help" > ../configure  &&
 chmod +x ../configure                                          &&
 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
-
+# Be prepared for mpg123 == 1.11.0, newer mpg123 does not need this.
+if spell_ok mpg123 && [[ $(installed_version mpg123) == 1.11.0 ]]; then
+  cp -v "$SCRIPT_DIRECTORY/xmms2-0.6_and_0.7_mpg123-wscript" 
src/plugins/mpg123/wscript
+fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index cd2673c..5e550cb 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,8 @@
+2010-04-02 Thomas Orgis <sobukus AT sourcemage.org>
+       * PRE_BUILD: Only apply the patch for mpg123 1.11.0 itself.
+         This is subject to removal once we are sure that this version
+         of mpg123 is history...
+
 2010-03-22 Thomas Orgis <sobukus AT sourcemage.org>
        * DEPENDS, PRE_BUILD, *-mpg123_64.diff: Prepare build for mpg123 
1.11.0 .
 
diff --git a/x11-libs/wine/PRE_BUILD b/x11-libs/wine/PRE_BUILD
index eb5352c..7f2eb2d 100755
--- a/x11-libs/wine/PRE_BUILD
+++ b/x11-libs/wine/PRE_BUILD
@@ -4,8 +4,10 @@ if [[  "$WINE_DEVEL"  ==  "n"  ]];  then
   patch $SOURCE_DIRECTORY/dlls/gdi32/freetype.c                \
         $SCRIPT_DIRECTORY/freetype2-2.3.8-winebug-17024.patch
 fi &&
+# This is only needed for a period where we can expect mpg123 1.11.0 being 
installed.
 if test "$WINE_VCS" == y -o "$WINE_DEVEL" == y  &&
-   [[ ${SMGL_COMPAT_ARCHS[0]} == 32 ]] && is_depends_enabled $SPELL mpg123; 
then
+   [[ ${SMGL_COMPAT_ARCHS[0]} == 32 ]] && is_depends_enabled $SPELL mpg123 &&
+   spell_ok mpg123 && [[ $(installed_version mpg123) == 1.11.0 ]]; then
   cd $SOURCE_DIRECTORY &&
   if [[ "$WINE_DEVEL" == y ]]; then
     patch -Np0 < "$SCRIPT_DIRECTORY/wine-1.1.41-mpg123_64.diff"