sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Eric Sandall (f6fb98d651973391deef74924a34db19ba86960a)

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 (f6fb98d651973391deef74924a34db19ba86960a)
Date: Fri, 2 Aug 2013 17:04:23 -0500

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

dev/null |binary
devel/prelink/DETAILS | 2 +-
devel/prelink/HISTORY | 3 +++
devel/prelink/prelink-20130503.tar.bz2.sig |binary
x11-libs/wine/DEPENDS | 24 +++++++++++++++++++-----
x11-libs/wine/DETAILS | 2 +-
x11-libs/wine/HISTORY | 5 +++++
7 files changed, 29 insertions(+), 7 deletions(-)

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

wine: Updated devel to 1.7.0
1.7.0+ optionally uses lcms2 instead of lcms
1.6 and 1.7 optionally depend on openal-soft (not openal)

commit 194f2f0e39f7540d0189a7f702619f51feeab7e4
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

prelink: Updated to 20130503

diff --git a/devel/prelink/DETAILS b/devel/prelink/DETAILS
index cf7e608..8182624 100755
--- a/devel/prelink/DETAILS
+++ b/devel/prelink/DETAILS
@@ -1,5 +1,5 @@
SPELL=prelink
- VERSION=20060213
+ VERSION=20130503
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=http://people.redhat.com/jakub/$SPELL/$SOURCE
diff --git a/devel/prelink/HISTORY b/devel/prelink/HISTORY
index 03f5141..824885f 100644
--- a/devel/prelink/HISTORY
+++ b/devel/prelink/HISTORY
@@ -1,3 +1,6 @@
+2013-08-02 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 20130503
+
2009-05-29 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: SOURCE_URL and WEB_SITE are ftp -> http
Updated to 20060213
diff --git a/devel/prelink/prelink-20060213.tar.bz2.sig
b/devel/prelink/prelink-20060213.tar.bz2.sig
deleted file mode 100644
index 65e75ff..0000000
Binary files a/devel/prelink/prelink-20060213.tar.bz2.sig and /dev/null differ
diff --git a/devel/prelink/prelink-20130503.tar.bz2.sig
b/devel/prelink/prelink-20130503.tar.bz2.sig
new file mode 100644
index 0000000..8e24104
Binary files /dev/null and b/devel/prelink/prelink-20130503.tar.bz2.sig differ
diff --git a/x11-libs/wine/DEPENDS b/x11-libs/wine/DEPENDS
index 58fe39e..79aa4b2 100755
--- a/x11-libs/wine/DEPENDS
+++ b/x11-libs/wine/DEPENDS
@@ -51,10 +51,17 @@ optional_depends JPEG \
'--without-jpeg' \
'for JPEG supprt' &&

-optional_depends lcms \
- '--with-cms' \
- '--without-cms' \
- 'for CMS color management' &&
+if [[ "x$WINE_BRANCH" == "xscm" || "x$WINE_BRANCH" == "xdevel" ]]; then
+ optional_depends lcms2 \
+ '--with-cms' \
+ '--without-cms' \
+ 'for CMS color management'
+else
+ optional_depends lcms \
+ '--with-cms' \
+ '--without-cms' \
+ 'for CMS color management'
+fi &&

optional_depends libgphoto2 \
'--with-gphoto' \
@@ -165,4 +172,11 @@ suggest_depends 'wine-gecko' \
optional_depends mpg123 \
'--with-mpg123' \
'--without-mpg123' \
- 'for MP3 decoding support'
+ 'for MP3 decoding support' &&
+
+optional_depends openal-soft \
+ '--with-openal' \
+ '--without-openal' \
+ 'for Open Audio Library API support' &&
+
+suggest_depends prelink '' '' 'to correctly set base address of core
dlls'
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index bc41ddb..51f1428 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
if [[ $WINE_BRANCH == devel ]]; then
- VERSION=1.6
+ VERSION=1.7.0
else
VERSION=1.6
fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 1d50564..b41c9b1 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,8 @@
+2013-08-02 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated devel to 1.7.0
+ * DEPENDS: 1.7.0+ optionally uses lcms2 instead of lcms
+ 1.6 and 1.7 optionally depend on openal-soft (not openal)
+
2013-07-24 Eric Sandall <sandalle AT sourcemage.org>
* sc2-login.diff: Updated to apply cleanly to 1.6

[SM-Commit] GIT changes to master grimoire by Eric Sandall (f6fb98d651973391deef74924a34db19ba86960a), Eric Sandall, 08/02/2013