Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (582180a071cd319b7f6fe730e879f679c99e9468)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (582180a071cd319b7f6fe730e879f679c99e9468)
  • Date: Fri, 16 Jul 2010 21:47:21 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

x11-libs/wine/DEPENDS | 9 ----
x11-libs/wine/DETAILS | 4 +-
x11-libs/wine/HISTORY | 10 +++++
x11-libs/wine/PRE_BUILD | 17 --------
x11-libs/wine/freetype2-2.3.8-winebug-17024.patch | 42
----------------------
x11-libs/wine/wine-1.1.41-mpg123_64.diff | 32 ----------------
x11-libs/wine/wine-git-mpg123_64.diff | 30 ---------------
7 files changed, 13 insertions(+), 131 deletions(-)

New commits:
commit 582180a071cd319b7f6fe730e879f679c99e9468
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wine: Remove MPG 1.11 patch, well beyond that point

commit 196df28c45b9d75f06b9214cb5097242b9999eea
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wine: Updated devel and stable to 1.2
Remove old 1.0 patches
Devel patches now apply to stable
Devel dependencies now apply to stable
freetype2-2.3.8-winebug-17024.patch no longer needed

diff --git a/x11-libs/wine/DEPENDS b/x11-libs/wine/DEPENDS
index 5902960..68a1b3b 100755
--- a/x11-libs/wine/DEPENDS
+++ b/x11-libs/wine/DEPENDS
@@ -175,11 +175,4 @@ suggest_depends 'wine-gecko' \
optional_depends mpg123 \
'--with-mpg123' \
'--without-mpg123' \
- '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
+ 'for MP3 decoding support'
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index c4d4f05..ce6726f 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,9 +12,9 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
if [[ $WINE_DEVEL == y ]]; then
- VERSION=1.2-rc7
+ VERSION=1.2
else
- VERSION=1.0.1
+ VERSION=1.2
fi
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 100a80a..d4fc589 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,13 @@
+2010-07-16 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated devel and stable to 1.2
+ * PRE_BUILD: Remove old 1.0 patches
+ Devel patches now apply to stable
+ No longer need MPG123 1.11 patch
+ * DEPENDS: Devel dependencies now apply to stable
+ No longer needs autoconf/automake for mpg123 patch
+ * freetype2-2.3.8-winebug-17024.patch: No longer needed
+ * wine-1.1.41-mpg123_64.diff, wine-git-mpg123_64.diff: Removed
+
2010-07-11 Eric Sandall <sandalle AT sourcemage.org>
* CONFIGURE: Change SC2 Login patch query to all SC2 patches
* PRE_BUILD: Apply sc2-bug23556.diff if requested
diff --git a/x11-libs/wine/PRE_BUILD b/x11-libs/wine/PRE_BUILD
index a99021f..aa7ced1 100755
--- a/x11-libs/wine/PRE_BUILD
+++ b/x11-libs/wine/PRE_BUILD
@@ -1,22 +1,5 @@
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 &&
-# 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 &&
- 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"
- else
- patch -Np1 < "$SCRIPT_DIRECTORY/wine-git-mpg123_64.diff"
- fi &&
- autoreconf -iv
-fi &&
-
if [[ "$WINE_SC2_LOGIN" == "y" ]]; then
message "${MESSAGE_COLOR}Applying StarCraft II login bug
patch...${DEFAULT_COLOR}" &&
cd $SOURCE_DIRECTORY &&
diff --git a/x11-libs/wine/freetype2-2.3.8-winebug-17024.patch
b/x11-libs/wine/freetype2-2.3.8-winebug-17024.patch
deleted file mode 100644
index ae4bb30..0000000
--- a/x11-libs/wine/freetype2-2.3.8-winebug-17024.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-This is the fix for http://bugs.winehq.org/show_bug.cgi?id=17024
-
-From 3a07a8ae6b3798ebd58b3c762dad49059d4576e3 Mon Sep 17 00:00:00 2001
-From: Shunichi Fuji <palglowr@...>
-Date: Wed, 3 Sep 2008 19:51:37 +0900
-Subject: [PATCH] Adjust FT_MulFix function to Freetype cvs head.
-
-see http://lists.nongnu.org/archive/html/freetype-cvs/2008-09/msg00003.html
-
-Signed-off-by: Shunichi Fuji <palglowr@...>
----
- dlls/gdi32/freetype.c | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
-index cb351db..74e70ea 100644
---- a/dlls/gdi32/freetype.c
-+++ b/dlls/gdi32/freetype.c
-@@ -163,7 +163,11 @@ MAKE_FUNCPTR(FT_Get_Sfnt_Table);
- MAKE_FUNCPTR(FT_Init_FreeType);
- MAKE_FUNCPTR(FT_Load_Glyph);
- MAKE_FUNCPTR(FT_Matrix_Multiply);
-+#ifdef FT_MULFIX_INLINED
-+#define pFT_MulFix FT_MULFIX_INLINED
-+#else
- MAKE_FUNCPTR(FT_MulFix);
-+#endif
- MAKE_FUNCPTR(FT_New_Face);
- MAKE_FUNCPTR(FT_New_Memory_Face);
- MAKE_FUNCPTR(FT_Outline_Get_Bitmap);
-@@ -2434,7 +2438,9 @@ static BOOL init_freetype(void)
- LOAD_FUNCPTR(FT_Init_FreeType)
- LOAD_FUNCPTR(FT_Load_Glyph)
- LOAD_FUNCPTR(FT_Matrix_Multiply)
-+#ifndef FT_MULFIX_INLINED
- LOAD_FUNCPTR(FT_MulFix)
-+#endif
- LOAD_FUNCPTR(FT_New_Face)
- LOAD_FUNCPTR(FT_New_Memory_Face)
- LOAD_FUNCPTR(FT_Outline_Get_Bitmap)
---
-1.6.0.1
diff --git a/x11-libs/wine/wine-1.1.41-mpg123_64.diff
b/x11-libs/wine/wine-1.1.41-mpg123_64.diff
deleted file mode 100644
index 856a1bc..0000000
--- a/x11-libs/wine/wine-1.1.41-mpg123_64.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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
deleted file mode 100644
index f8a9d99..0000000
--- a/x11-libs/wine/wine-git-mpg123_64.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-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 Eric Sandall (582180a071cd319b7f6fe730e879f679c99e9468), Eric Sandall, 07/16/2010

Archive powered by MHonArc 2.6.24.

Top of Page