New commits:
commit 85b682c4f537e5bb52d8ebb15a78c910d8a2a36a
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
glib2: hard-depends on PYTHON to avoid the situation without any glib2
when INSTALL fails after removing old one ...
commit 9ce5af374646fdfa6e145fd7595bc828ee818648
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
pkgconfig: Remove glib2 dependency, fixing things to version 0.28.
This duplicates a bit of binary code because pkgconfig now relies on
internal glib2, but this is necessary because glib2 itself depends
on pkgconfig to be built. At least, the pkg-config command should be
working if present. It does not if, because of another bug, the glib2
install fails and the glib2 .so is missing. You cannot install glib2
after that. Pkgconfig is basic enough to warrant some extra care with
external dependencies (which is why they include a copy of glib2 to
begin with, mind).
commit fb4cf278fa2540b80807911184d17010a72df585
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
cairo: needs xextproto
commit 316764ceadd9c8cf8825e4c9c7e0446c39f0073b
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
whois: bump to 5.1.5 (source for 5.1.4 already pulled by upstream)
commit 0925da775967f90124513bafc8cb2a6382f84a14
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
firefox: fix build with gcc-4.9 (on a core2 64 bit machine with PIC
CFLAGS, if
that matters ... did not need that on an Athlon II X3 machine
with
"native" archspecs)
commit 76284605149443e43d1dc264d98032d70e418c4a
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
jack2: depends on libsamplerate, also change scm option to git
commit 7642033f615442ca0d344301d24fa07e6153ccfa
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
subversion: bump to 1.8.10 (1.8.9 source already unavailable)
commit b2603183758a257e42d2c0abdbd1b83a4b782658
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
xorg-server: really needs mesalib-1x
commit 76026893b683244535c2a1d83f6e195c61252849
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
libva-intel-driver: bump to 1.3.2 and fix build
commit 0edc8260b043c58abf4501b7b266956e61c7c45f
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
libva: bump to 1.3.1, more depends, build fix hopefully only for this
relase
commit d01309080f8b2e6dbbb153552ee90844e69f74bf
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
xf86-video-intel: bump to 2.99.911 and ignore mesalib mess (HACK)
if [[ $JACK2_BRANCH == scm ]]; then
depends subversion
diff --git a/audio-drivers/jack2/DETAILS b/audio-drivers/jack2/DETAILS
index e82467a..d6d4f22 100755
--- a/audio-drivers/jack2/DETAILS
+++ b/audio-drivers/jack2/DETAILS
@@ -4,11 +4,11 @@
WEB_SITE=http://jackaudio.org/
if [[ $JACK2_BRANCH == scm ]]; then
VERSION=$(get_scm_version)
- SOURCE=$SPELL-svn.tar.bz2
-
SOURCE_URL[0]=svn_http://subversion.jackaudio.org/jack/jack2/trunk/jackmp:jackdmp
+ SOURCE=$SPELL-git.tar.bz2
+ SOURCE_URL[0]=git://github.com/jackaudio/jack2.git
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
else
VERSION=1.9.10
SOURCE=$SPELLX-$VERSION.tar.bz2
diff --git a/audio-drivers/jack2/HISTORY b/audio-drivers/jack2/HISTORY
index 9549c96..db1667b 100644
--- a/audio-drivers/jack2/HISTORY
+++ b/audio-drivers/jack2/HISTORY
@@ -1,3 +1,7 @@
+2014-08-26 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: needs libsamplerate
+ * DETAILS: scm=git
+
2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: updated spell to 1.9.10
diff --git a/collab/subversion/DETAILS b/collab/subversion/DETAILS
index 121b2d6..684c209 100755
--- a/collab/subversion/DETAILS
+++ b/collab/subversion/DETAILS
@@ -1,6 +1,6 @@
SPELL=subversion
- VERSION=1.8.9
- SECURITY_PATCH=6
+ VERSION=1.8.10
+ SECURITY_PATCH=7
if [[ "$SVN_HEAD" == y ]]; then VERSION=${VERSION%.*}-HEAD; fi
SOURCE=$SPELL-$VERSION.tar.bz2
if [[ "$SVN_HEAD" == y ]]; then
diff --git a/collab/subversion/HISTORY b/collab/subversion/HISTORY
index 6039b82..fa042c1 100644
--- a/collab/subversion/HISTORY
+++ b/collab/subversion/HISTORY
@@ -1,3 +1,6 @@
+2014-08-27 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 1.8.10 ... They pulled the tarball already!
+
2014-05-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.8.9
diff --git a/devel/pkgconfig/BUILD b/devel/pkgconfig/BUILD
new file mode 100755
index 0000000..344ab34
--- /dev/null
+++ b/devel/pkgconfig/BUILD
@@ -0,0 +1,5 @@
+# Keep dependencies minimal: If for some reason glib2 is broken, it cannot
+# subsequently be built when pkg-config is also broken due to linking to
+# system glib2.
+OPTS="$OPTS --with-internal-glib" &&
+default_build
diff --git a/devel/pkgconfig/DEPENDS b/devel/pkgconfig/DEPENDS
deleted file mode 100755
index 329e0ab..0000000
--- a/devel/pkgconfig/DEPENDS
+++ /dev/null
@@ -1,3 +0,0 @@
-if [[ "$VERSION" != "0.25" ]]; then
- depends glib2
-fi
diff --git a/devel/pkgconfig/DETAILS b/devel/pkgconfig/DETAILS
index ff7cfdd..402a75f 100755
--- a/devel/pkgconfig/DETAILS
+++ b/devel/pkgconfig/DETAILS
@@ -1,13 +1,6 @@
SPELL=pkgconfig
-
-if spell_ok glib2; then
VERSION=0.28
SOURCE_HASH=sha512:6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
- else
- VERSION=0.25
-
SOURCE_HASH=sha512:6c50ca542733feeb10301097ade32075c5417ada5bdd195957de8521a28b20e0e7a54ed553fa3e022b24969e9deb97d72e289192cb2a3afc2c86241dc6cafa02
-fi
-
SOURCE=pkg-config-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/pkg-config-$VERSION
SOURCE_URL[0]=http://www.freedesktop.org/software/$SPELL/releases/$SOURCE
diff --git a/devel/pkgconfig/HISTORY b/devel/pkgconfig/HISTORY
index c6d2105..bf759d5 100644
--- a/devel/pkgconfig/HISTORY
+++ b/devel/pkgconfig/HISTORY
@@ -1,3 +1,9 @@
+2014-08-27 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: fixed to version 0.28 now
+ * DEPENDS: gone, see below
+ * BUILD: enforcing use of internal glib2 to avoid vicious dependency
+ circle with such a basic tool (which is required to build glib2)
+
2013-07-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.28
diff --git a/gnome2-libs/glib2/DEPENDS b/gnome2-libs/glib2/DEPENDS
index 603c114..c2cb174 100755
--- a/gnome2-libs/glib2/DEPENDS
+++ b/gnome2-libs/glib2/DEPENDS
@@ -14,10 +14,7 @@ if ! spell_installed pkgconfig; then
fi &&
if spell_ok $SPELL; then
optional_depends FAM \
diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY
index 1212d78..324f1eb 100644
--- a/gnome2-libs/glib2/HISTORY
+++ b/gnome2-libs/glib2/HISTORY
@@ -1,3 +1,8 @@
+2014-08-28 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: some PYTHON is always needed now to avoid failure during
+ INSTALL (for a dbus codegen tool, also the modular-tests option
+ doesn't exist anymore)
+
2014-08-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 2.41.2
-if spell_ok mesalib; then
- persistent_read mesalib MESALIB_BUILD MESALIB_BUILD || true
-fi &&
+# Dunno what to do about that DRI/mesalib business. It's a bit crazy.
+# Let's configure figure that out. Actually, the DRI choice is nicely
+# propagated from the Xorg infrastructure. Do we really need to
+# prescibe things here? Let's just build that crap! -- ThOr
+#if spell_ok mesalib; then
+# persistent_read mesalib MESALIB_BUILD MESALIB_BUILD || true
+#fi &&
+# Still coupled? -- ThOr
if is_depends_enabled $SPELL libxvmc; then
depends dri2proto &&
depends xcb-util
diff --git a/xorg-driver/xf86-video-intel/DETAILS
b/xorg-driver/xf86-video-intel/DETAILS
index 4b5c2fc..cd6e9d2 100755
--- a/xorg-driver/xf86-video-intel/DETAILS
+++ b/xorg-driver/xf86-video-intel/DETAILS
@@ -1,8 +1,8 @@
SPELL=xf86-video-intel
- VERSION=2.21.15
+ VERSION=2.99.911
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/$SOURCE
-
SOURCE_HASH=sha512:ca9680716445d0e9ba1a5d87433455f7a5f558802b4d214d79496426dbfd3e598968f784b531de024df30fefcc114d6e40cc9c6da94604beb48cd4430bf9e491
+
SOURCE_HASH=sha512:73a6f44f80322c3812e8d36503e42cf00e19028d64244447defecd514c17fa5ed1cacaee0c82b96d4ae8d9108e68e446ca2bbd628406a79528ea42194845b20b
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
LICENSE[0]=XCL
WEB_SITE=http://xorg.freedesktop.org/wiki
diff --git a/xorg-driver/xf86-video-intel/HISTORY
b/xorg-driver/xf86-video-intel/HISTORY
index 433aa46..be43c2d 100644
--- a/xorg-driver/xf86-video-intel/HISTORY
+++ b/xorg-driver/xf86-video-intel/HISTORY
@@ -1,3 +1,10 @@
+2014-08-27 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: removed mesalib references, relying on configure as things
+ get too complicated with two mesalib spells of which one is the only
+ proper alternative
+ * DETAILS: required bump to 2.99.911 (old version fails because of
+ XDamage changes, apparently)
+
2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: mesalib => MESALIB
diff --git a/xorg-xserver/xorg-server/DEPENDS
b/xorg-xserver/xorg-server/DEPENDS
index a3bfbe0..92cfb02 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -131,7 +131,7 @@ depends flex &&
depends pkgconfig &&
depends libtool &&
depends gawk &&
-depends MESALIB &&
+depends mesalib-1x &&
depends rgb &&
depends font-cursor-misc &&
depends font-misc-misc &&
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 0047be6..aab9e28 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,7 @@
+2014-08-27 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: really needs mesalib-1x ... so actually the old mesalib
+ spell is obsolete, what's the plan?
+
2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: needs xcb cruft to build
[SM-Commit] GIT changes to devel-xorg-modular grimoire by Thomas Orgis (85b682c4f537e5bb52d8ebb15a78c910d8a2a36a),
Thomas Orgis, 08/29/2014