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

Eric Sandall scm at sourcemage.org
Wed Mar 7 22:20:16 EST 2012


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

 x11-libs/wine/DEPENDS |   23 ++++-------------------
 x11-libs/wine/DETAILS |    4 ++--
 x11-libs/wine/HISTORY |    6 ++++++
 3 files changed, 12 insertions(+), 21 deletions(-)

New commits:
commit cf4ca29383ba1cd489f4eb9f51fa640d00700a4e
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    wine: Updated stable to 1.4
    esd, jack, nas are no longer used
    libxext dependency no longer implies Xshm extension

commit 3d6e9308195523f330ecbabc82b1b544e50384b8
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    wine: Updated devel to 1.4

diff --git a/x11-libs/wine/DEPENDS b/x11-libs/wine/DEPENDS
index 8d4b27f..1b6eee8 100755
--- a/x11-libs/wine/DEPENDS
+++ b/x11-libs/wine/DEPENDS
@@ -26,11 +26,6 @@ optional_depends  docbook-utils             \
                   ""                        \
                   "for building wine documentation"  &&
 
-optional_depends  esound                                     \
-                  '--with-esd'                               \
-                  '--without-esd'                            \
-                  'for Enhanced Sound Daemon mixer support'  &&
-
 optional_depends  fontconfig                  \
                   '--with-fontconfig'         \
                   '--without-fontconfig'      \
@@ -51,11 +46,6 @@ optional_depends  hal                                \
                   '--without-hal'                    \
                   'for dynamic drive configuration'  &&
 
-optional_depends  JACK-DRIVER               \
-                  '--with-jack'             \
-                  '--without-jack'          \
-                  'for JACK audio support'  &&
-
 optional_depends  JPEG                      \
                   '--with-jpeg'             \
                   '--without-jpeg'          \
@@ -87,11 +77,6 @@ optional_depends  MSTTF                                  \
                   'for original MS TrueType fonts'       \
                   'z-rejected'                           &&
 
-optional_depends  nas                                    \
-                  '--with-nas'                           \
-                  '--without-nas'                        \
-                  'for NAS audio support'                &&
-
 # the --with-curses option fails
 # because it can't find libncurses
 #optional_depends  ncurses               \
@@ -166,10 +151,10 @@ optional_depends  libxrender                            \
                   '--without-xrender'                   \
                   'for X11 XRender extension support'   &&
 
-optional_depends  libxext                               \
-                  '--with-xshape --with-xshm'           \
-                  '--without-xshape --without-xshm'     \
-                  'for X11 XShape and Xshmextension support'  &&
+optional_depends  libxext                             \
+                  '--with-xshape'                     \
+                  '--without-xshape'                  \
+                  'for X11 XShape extension support'  &&
 
 optional_depends  xf86vidmodeproto                      \
                   '--with-xxf86vm'                      \
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index e772903..750fac1 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_BRANCH == devel ]]; then
-         VERSION=1.4-rc6
+         VERSION=1.4
   else
-         VERSION=1.2.3
+         VERSION=1.4
   fi
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sign
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index f0f34d7..3557868 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,9 @@
+2012-03-07 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated devel to 1.4
+	  Updated stable to 1.4
+	* DEPENDS: esd, jack, nas are no longer used
+	  libxext dependency no longer implies Xshm extension
+
 2012-03-02 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated devel to 1.4-rc6
 


More information about the SM-Commit mailing list