Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a827cbb5a3ca5286696435ba2c24c5876b21209f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a827cbb5a3ca5286696435ba2c24c5876b21209f)
  • Date: Sun, 11 Oct 2009 14:05:02 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

graphics/fontforge/DEPENDS | 8 +++++++-
graphics/fontforge/DETAILS | 8 ++++----
graphics/fontforge/HISTORY | 6 ++++++
graphics/fontforge/PRE_BUILD | 3 +++
http/w3c-libwww/DEPENDS | 5 ++---
http/w3c-libwww/HISTORY | 4 ++++
libs/dosemu/DEPENDS | 10 ++++++++--
libs/dosemu/HISTORY | 3 +++
libs/sdl/DEPENDS | 19 ++++++++++++-------
libs/sdl/HISTORY | 3 +++
video-libs/libmpeg2/DEPENDS | 9 +++++----
video-libs/libmpeg2/HISTORY | 3 +++
x11-libs/wine/DEPENDS | 16 +++++++++-------
x11-libs/wine/HISTORY | 3 +++
14 files changed, 72 insertions(+), 28 deletions(-)

New commits:
commit 01afeeacffd266e511c917f156d09eb157fa2629
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

dosemu - depends xorg-libs => libx11

commit de6a37c1c17e8728d05df4f93ca487e2e47dd805
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

sdl - depends xorg-libs => libx11

commit be0dba7f04c0d2481bbe5ea373b05859e2e0fe47
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libmpeg2 - xorg-libs =>libx11

commit f5bef41187fae6e9e2b30144a42e1d8dc02470e7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

w3c-libwww - remove xorg-libs

commit 46a25322341960dd309cbd05f1e6f80167bb62e2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

wine - depends xorg-libs => libx11

commit 6e03d475e54c1ee5d18dc5a8d4c2423c08447812
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

fontforge: => 20090923

diff --git a/graphics/fontforge/DEPENDS b/graphics/fontforge/DEPENDS
index c242487..2bc19ca 100755
--- a/graphics/fontforge/DEPENDS
+++ b/graphics/fontforge/DEPENDS
@@ -1,4 +1,10 @@
-depends xorg-libs &&
+depends libx11 &&
+depends libxft &&
+depends libxkbui &&
+depends libxi &&
+depends libice &&
+depends libsm &&
+depends cairo &&
depends zlib &&
depends libpng &&
depends giflib &&
diff --git a/graphics/fontforge/DETAILS b/graphics/fontforge/DETAILS
index 3853c89..1d1efa9 100755
--- a/graphics/fontforge/DETAILS
+++ b/graphics/fontforge/DETAILS
@@ -1,13 +1,13 @@
SPELL=fontforge
- VERSION=20090622
-
SOURCE_HASH=sha512:cf33ad0a29cb75f1421c2e16b3205f4a4cf8516540766eeba831233e08aaa1e13a1124d022df120ec4a1119ea0668a49882bc9a66f76dee727bc4cb31ccee6dd
+ VERSION=20090923
+
SOURCE_HASH=sha512:2a7646e67c1887ae39cda8917c2cdb29fd54b3e9418e05f9976893aeb0829c46a81d3d5aff73c01f6eb9e67922d7f687abde613295fcc6d3d07b9ef7c4606b2d
SOURCE=${SPELL}_full-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
if [[ "$INSTALL_DOCS" == "y" ]]; then
- DOCS_VERSION=20090622
-
SOURCE2_HASH=sha512:a07964c42d9f190ab7e5ae059aafff3ec930c7bd7133e4b73887aa681e31ab5f9f819ba40b61fd5285735802472af1485459b8569b205b450162e64bd1fb0de5
+ DOCS_VERSION=20090914
+
SOURCE2_HASH=sha512:1df006b65e784950e0ce79cae011248e61c0fdf5331134735a6dadf520a53c087e8ec0d4082a59167a3f013b02f6a8564be178c7a749244cced5b690f2d1078c
SOURCE2=${SPELL}_htdocs-$DOCS_VERSION.tar.bz2
SOURCE2_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE2
# SOURCE2_GPG="gurus.gpg:${SOURCE2}.sig"
diff --git a/graphics/fontforge/HISTORY b/graphics/fontforge/HISTORY
index 4916370..24a5387 100644
--- a/graphics/fontforge/HISTORY
+++ b/graphics/fontforge/HISTORY
@@ -1,3 +1,9 @@
+2009-10-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 20090923
+ * DEPENDS: replace xorg-libs by specific libraries
+ add cairo
+ * PRE_BUILD: fix bad configure if use -O3 in CFLAGS
+
2009-06-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 20090622

diff --git a/graphics/fontforge/PRE_BUILD b/graphics/fontforge/PRE_BUILD
index 81697fe..4dcd4dd 100755
--- a/graphics/fontforge/PRE_BUILD
+++ b/graphics/fontforge/PRE_BUILD
@@ -1,4 +1,7 @@
default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+# fix bad config file
+sed -i '/CFLAGS_NOOPT/s|sed -e s/-O2//|sed "s/-O2//;s/-O3//"|' configure
configure.dynamic &&
if [[ "$INSTALL_DOCS" == "y" ]]; then
mkdir $SOURCE_DIRECTORY/htdocs &&
cd $SOURCE_DIRECTORY/htdocs &&
diff --git a/http/w3c-libwww/DEPENDS b/http/w3c-libwww/DEPENDS
index a1e8a7a..f88ff37 100755
--- a/http/w3c-libwww/DEPENDS
+++ b/http/w3c-libwww/DEPENDS
@@ -1,7 +1,6 @@
-optional_depends "zlib" "--with-zlib" "--without-zlib" "for zlib
compression" &&
+optional_depends "zlib" "--with-zlib=z" "--without-zlib" "for zlib
compression" &&
optional_depends "mysql" "--with-mysql" "--without-mysql" "for mysql
access" &&
-optional_depends "openssl" "--with-ssl" "--without-ssl" "for SSL
support" &&
-optional_depends "xorg-libs" "--with-x" "--without-x" "for
XFree86 support"
+optional_depends "openssl" "--with-ssl" "--without-ssl" "for SSL
support"

# expat breaks liboop
#optional_depends "expat" "--with-expat" "--without-expat" "for
expat XML parsing support"
diff --git a/http/w3c-libwww/HISTORY b/http/w3c-libwww/HISTORY
index 6a3c84e..f1b423b 100644
--- a/http/w3c-libwww/HISTORY
+++ b/http/w3c-libwww/HISTORY
@@ -1,3 +1,7 @@
+2009-10-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: remove irrelevant xorg-libs, it is never used
+ fix finding zlib
+
2009-05-08 Eric Sandall <sandalle AT sourcemage.org>
* BUILD: Disable -Wl,--as-needed in LDFLAGS
Even with patches and fixes from the following, it fails:
diff --git a/libs/dosemu/DEPENDS b/libs/dosemu/DEPENDS
index 29ec9f0..7b83246 100755
--- a/libs/dosemu/DEPENDS
+++ b/libs/dosemu/DEPENDS
@@ -11,11 +11,17 @@ optional_depends libsndfile \
"--without-sndfile" \
"sound support" &&

-optional_depends xorg-libs \
+optional_depends libx11 \
"--with-x" \
"--without-x" \
"x11 support" &&
-
+if is_depends_enabled $SPELL libx11;then
+ depends libice &&
+ depends libxext &&
+ depends bdftopcf &&
+ depends mkfontdir &&
+ depends libxxf86vm
+fi &&
optional_depends gpm \
"--with-gpm" \
"--without-gpm" \
diff --git a/libs/dosemu/HISTORY b/libs/dosemu/HISTORY
index 069c212..8c2f64e 100644
--- a/libs/dosemu/HISTORY
+++ b/libs/dosemu/HISTORY
@@ -1,3 +1,6 @@
+2009-10-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: xrog-libs => libx11 and friends
+
2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Switch X11-LIBS to the one and only xorg-libs

diff --git a/libs/sdl/DEPENDS b/libs/sdl/DEPENDS
index f83ba98..e3790ac 100755
--- a/libs/sdl/DEPENDS
+++ b/libs/sdl/DEPENDS
@@ -5,11 +5,21 @@ optional_depends nasm \
"--disable-nasm" \
"for faster video overlay" &&

-optional_depends xorg-libs \
+optional_depends libx11 \
"--with-x" \
"--without-x" \
"for X11 video output support" &&

+if is_depends_enabled $SPELL libx11;then
+ depends libxext &&
+ depends libxrender &&
+ optional_depends libxrandr "--enable-video-x11-xrandr" '' "X11 Xrandr
extension support" &&
+ optional_depends libxxf86dga '--enable-dga' '' 'X11 DGA code' &&
+ optional_depends libxxf86vm '--enable-video-x11-vm' '' 'X11 VM extension'
&&
+ optional_depends libxinerama '--enable-video-x11-xinerama' '' 'Xinerama
support' &&
+ optional_depends libxv '--enable-video-x11-xv' '' 'XvImage extension'
+fi &&
+
optional_depends aalib \
"--enable-video-aalib" \
"--disable-video-aalib" \
@@ -53,9 +63,4 @@ optional_depends directfb \
optional_depends pulseaudio \
"--enable-pulseaudio" \
"--disable-pulseaudio" \
- "for PulseAudio output support" &&
-
-optional_depends libxrandr \
- "--enable-video-x11-xrandr" \
- "--enable-video-x11-xrandr=no" \
- "for X11 Xrandr extension support"
+ "for PulseAudio output support"
diff --git a/libs/sdl/HISTORY b/libs/sdl/HISTORY
index 35b1a8a..c70c8b3 100644
--- a/libs/sdl/HISTORY
+++ b/libs/sdl/HISTORY
@@ -1,3 +1,6 @@
+2009-10-11 Treeve Jelbert ,treeve AT sourcemage.org>
+ * DEPENDS: xorg-libs => libx11 and friends
+
2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
* SUB_DEPENDS, PRE_SUB_DEPENDS, DEPENDS: Switch X11-LIBS to the one
and
only xorg-libs
diff --git a/video-libs/libmpeg2/DEPENDS b/video-libs/libmpeg2/DEPENDS
index c0268b0..1c75198 100755
--- a/video-libs/libmpeg2/DEPENDS
+++ b/video-libs/libmpeg2/DEPENDS
@@ -3,7 +3,8 @@ optional_depends sdl \
"--disable-sdl" \
"for SDL video output in mpeg2dec" &&

-optional_depends xorg-libs \
- "" \
- "--without-x" \
- "for X11 video output in mpeg2dec"
+optional_depends libx11 '' "--without-x" "for X11 video output in
mpeg2dec" &&
+if is_depends_enabled $SPELL libx11;then
+ depends libxext &&
+ depends libxv
+fi
diff --git a/video-libs/libmpeg2/HISTORY b/video-libs/libmpeg2/HISTORY
index 8639019..9d7db5d 100644
--- a/video-libs/libmpeg2/HISTORY
+++ b/video-libs/libmpeg2/HISTORY
@@ -1,3 +1,6 @@
+2009-10-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: xorg-libs => libx11 and friends
+
2008-09-16 Ladislav Hagara <hgr AT vabo.cz>
* *: mpeg2dec spell renamed to libmpeg2
* DETAILS: updated to 0.5.1
diff --git a/x11-libs/wine/DEPENDS b/x11-libs/wine/DEPENDS
index 7994f95..68a1b3b 100755
--- a/x11-libs/wine/DEPENDS
+++ b/x11-libs/wine/DEPENDS
@@ -114,16 +114,18 @@ optional_depends winedoc \
"" \
"for wine documentation" &&

-optional_depends xorg-libs \
- "--with-x" \
- "--without-x" \
- "X gui support" &&
-
optional_depends sane-backends \
'--without-sane' \
'--without-sane' \
'for scanner support' &&

+optional_depends libx11 \
+ "--with-x" \
+ "--without-x" \
+ "X gui support" &&
+if is_depends_enabled $SPELL libx11;then
+depends libice &&
+depends libsm &&
optional_depends libxinerama \
'--with-xinerama' \
'--without-xinerama' \
@@ -162,8 +164,8 @@ optional_depends libxext \
optional_depends xf86vidmodeproto \
'--with-xxf86vm' \
'--without-xxf86vm' \
- 'for Xvidmode support' &&
-
+ 'for Xvidmode support'
+fi &&
suggest_depends 'wine-gecko' \
'' \
'' \
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index fec36c4..7834e73 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2009-10-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: xorg-libs => libx11 and friends
+
2009-10-09 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.1.31




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a827cbb5a3ca5286696435ba2c24c5876b21209f), Treeve Jelbert, 10/11/2009

Archive powered by MHonArc 2.6.24.

Top of Page