sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Thomas Orgis (a6753b84f253d909e6a7dc4df1cd43729fa54280)
- From: Thomas Orgis <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (a6753b84f253d909e6a7dc4df1cd43729fa54280)
- Date: Sun, 24 Aug 2014 09:09:46 -0500
GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:
crypto/nss/HISTORY | 6 +
crypto/nss/INSTALL | 2
crypto/nss/PRE_BUILD | 13 +-
crypto/nss/nss-pem-20140808.tar.bz2 |binary
graphics-libs/freeglut/DEPENDS | 4
graphics-libs/freeglut/HISTORY | 3
libs/libdrm/HISTORY | 4
libs/libdrm/HISTORY.orig | 195
++++++++++++++++++++++++++++++++++++
libs/libdrm/PRE_SUB_DEPENDS | 2
libs/libdrm/SUB_DEPENDS | 2
x11-toolkits/wxgtk/DEPENDS | 4
x11-toolkits/wxgtk/HISTORY | 3
12 files changed, 232 insertions(+), 6 deletions(-)
New commits:
commit a6753b84f253d909e6a7dc4df1cd43729fa54280
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
wxgtk: depend on glu
commit 5393a6a3293759fb015be90e8497e27f1fcb75d6
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
freeglut: fix deps for mesalib-1x
commit 0982eeb4874341a4d5f24d225060808ba4880659
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
libdrm: NV and NOUVEAU duality
commit 7dbcaf56fca5b1f9f07123e14d1c1eae89d40be6
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
nss: fixup, also new PEM; spell still a mess
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 3c0c110..dd56ffd 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: fixup of default branch with PEM
+ * nss-pem-20140808.tar.bz2: new PEM from
+ https://git.fedorahosted.org/git/nss-pem.git
+ * INSTALL: fix path for nss-config in 3.15.5
+
2014-07-22 Treeve Jelbert <treeve AT sourcemage.org>
* PRE_BUILD: fix 3.16 aptching
diff --git a/crypto/nss/INSTALL b/crypto/nss/INSTALL
index 0e7491d..f216bde 100755
--- a/crypto/nss/INSTALL
+++ b/crypto/nss/INSTALL
@@ -31,7 +31,7 @@ install -v -m755 */bin/* $INSTALL_ROOT/usr/bin &&
if [[ $NSS_BRANCH == "3.16" ]]; then
install -v -m755 ../nss/config/nss-config $INSTALL_ROOT/usr/bin
elif [[ $NSS_BRANCH == "3.15" ]]; then
- install -v -m755 ../security/nss/cmd/disttools/nss-config
$INSTALL_ROOT/usr/bin
+ install -v -m755 ../nss/config/nss-config $INSTALL_ROOT/usr/bin
fi &&
install -v -d -m755 $INSTALL_ROOT/usr/include/nss &&
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index 543ad0e..127e978 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -12,9 +12,16 @@ else
patch -p1 < $SCRIPT_DIRECTORY/nss-3.12-config-1.patch
fi &&
-if [[ "$NSS_PEM" == "y" && $NSS_BRANCH == "3.14" ]]; then
- tar jxvf $SCRIPT_DIRECTORY/nss-pem-20100412.tar.bz2 &&
- patch -p0 < $SCRIPT_DIRECTORY/nss-enable-pem.patch &&
+if [[ "$NSS_PEM" == "y" ]]; then
+ # New or old source trees are easy to tell apart.
+ if test -e nss; then
+ tar jxvf $SCRIPT_DIRECTORY/nss-pem-20140808.tar.bz2 &&
+ patch -p3 < $SCRIPT_DIRECTORY/nss-enable-pem.patch
+ else
+ # Playing safe with old stuff, no new PEM source there.
+ tar jxvf $SCRIPT_DIRECTORY/nss-pem-20100412.tar.bz2 &&
+ patch -p0 < $SCRIPT_DIRECTORY/nss-enable-pem.patch
+ fi &&
if [[ $NSS_BRANCH == "3.14" ]]; then
patch -p1 <
$SPELL_DIRECTORY/nss-3.14.3_sync_with_upstream_softokn_changes.patch
fi
diff --git a/crypto/nss/nss-pem-20140808.tar.bz2
b/crypto/nss/nss-pem-20140808.tar.bz2
new file mode 100644
index 0000000..8c23ceb
Binary files /dev/null and b/crypto/nss/nss-pem-20140808.tar.bz2 differ
diff --git a/graphics-libs/freeglut/DEPENDS b/graphics-libs/freeglut/DEPENDS
index d3212c0..3bb1971 100755
--- a/graphics-libs/freeglut/DEPENDS
+++ b/graphics-libs/freeglut/DEPENDS
@@ -1,4 +1,8 @@
depends OPENGL &&
+if test mesalib-1x = "$(get_spell_provider $SPELL OPENGL)"; then
+ # New mesalib has it separated out.
+ depends glu
+fi &&
depends libx11 &&
depends libxi &&
depends libxext &&
diff --git a/graphics-libs/freeglut/HISTORY b/graphics-libs/freeglut/HISTORY
index e3d4546..5ffe91c 100644
--- a/graphics-libs/freeglut/HISTORY
+++ b/graphics-libs/freeglut/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: separate glu for mesalib-1x
+
2014-05-29 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: major cleanup
diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY
index 06a59c1..ae584fc 100644
--- a/libs/libdrm/HISTORY
+++ b/libs/libdrm/HISTORY
@@ -1,3 +1,7 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: support NV and NOUVEAU, both in field
+ use:-/
+
2014-07-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 2.4.56
diff --git a/libs/libdrm/HISTORY.orig b/libs/libdrm/HISTORY.orig
new file mode 100644
index 0000000..06a59c1
--- /dev/null
+++ b/libs/libdrm/HISTORY.orig
@@ -0,0 +1,195 @@
+2014-07-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.4.56
+
+2014-07-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.4.55
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2014-05-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.4.54
+
+2014-04-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.4.53
+
+2014-01-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.4.51
+
+2013-12-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.4.50
+
+2013-11-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.4.49
+
+2013-11-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.4.48
+
+2013-10-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.4.47
+
+2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: udev => UDEV
+
+2013-07-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.4.46
+
+2013-06-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD: fix nouveau
+
+2013-05-30 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: 2.4.45
+
+2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PREPARE, PRE_BUILD: Use prepare_select_branch
+
+2011-08-09 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * DEPENDS: Added libpciaccess
+
+2011-06-16 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.26
+
+2011-04-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.25
+
+2010-12-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.23
+
+2010-10-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.22
+
+2010-06-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.21
+
+2010-04-26 Eric Sandall <sandalle AT sourcemage.org>
+ * {PRE_,}SUB_DEPENDS: Allow forcing LIBDRM_NV
+
+2010-04-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.20
+
+2010-03-03 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2.4.19
+ * BUILD: Radeon KMS API is no longer experimental
+ Disable Radeon KMS API if not wanted
+ * {PRE_,}SUB_DEPENDS: Allow depending on Radeon KMS API
+
+2010-02-26 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFIGURE: Mark Radeon KMS as experimental
+ Upper-case beginning of queries
+
+2010-02-17 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.18
+
+2010-01-21 Eric Sandall <sandalle AT sourcemage.org>
+ * REPAIR^none^PRE_SUB_DEPEND: This is needed, thanks Arwed. :)
+
+2010-01-20 Eric Sandall <sandalle AT sourcemage.org>
+ * {PRE_,}SUB_DEPENDS: Use correct flag ('y' not --enable-intel)
+ * BUILD: Pass --enable-intel when Intel KMS API is wanted
+ * REPAIR^none^{PRE_,}SUB_DEPENDS: Removed, unneeded
+
+2010-01-19 Eric Sandall <sandalle AT sourcemage.org>
+ * {PRE_,}SUB_DEPENDS: Allow forcing Intel KMS API
+ * REPAIR^none^{PRE_,}SUB_DEPENDS: Replace missing files
+
+2009-12-18 Arjan Bouter <abouter AT sourcemage.org>
+ * CONFIGURE,BUILD,INSTALL: there is no longer a libdrm subdir
+ and the kernel modules can not be build here. Made intel optional.
+ * CONFIGURE: the KMS options are also in the release versions now
+
+2009-12-17 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2.4.16
+ SOURCE matches upstream posted SHA1
+
+2009-10-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2.4.15
+ SOURCE matches upstream posted MD5
+
+2009-10-01 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2.4.14
+ SOURCE matches upstream posted MD5
+
+2009-08-28 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2.4.13
+ SOURCE matches upstream posted MD5
+ Removed XORG_VER
+
+2009-08-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.4.12
+
+2009-07-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFIGURE, BUILD: add experimental radeon support
+
+2009-07-29 Arjan Bouter <abouter AT sourcemage.org>
+ * BUILD: fixed typo, found by Finn Haedicke
+
+2009-07-28 Arjan Bouter <abouter AT sourcemage.org>
+ * BUILD, CONFIGURE, INSTALL: added options for radeon
+
+2009-05-15 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2.4.11
+
+2009-04-15 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2.4.9
+ SOURCE matches upstream posted MD5
+
+2009-02-25 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2.4.5
+
+2009-02-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: fix generation of config for git version
+ * CONFIGURE, BUILD: added
+
+2009-01-23 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2.4.4
+
+2008-11-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.4.1
+
+2008-10-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.4.0
+ * DEPENDS: added; libpthread-stubs is needed, udev is optional
+
+2008-08-05 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Updated to 2.3.1.
+ * DEPENDS: Deleted, only had bogus dependency on g++.
+ * DETAILS, PREPARE, PRE_BUILD: Added git version,
+ uses the same git repo and source file as the drm spell.
+
+2006-12-03 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: update to 2.3.0
+
+2006-11-05 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: update to 2.2.0
+
+2006-09-16 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: new version 2.0.2
+
+2006-05-23 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: added g++
+ * DETAILS: version update 2.0.1
+
+2006-03-05 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * CONFIGURE: (automated) removed seemingly useless file
+
+2005-12-26 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: added XORG_VER
+ updated SOURCE_URL
+
+2005-12-15 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: Updated SOURCE_URL to RC4
+
+2005-12-15 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: Updated VERSION to 2.0
+
+2005-12-14 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: Updated SOURCE_URL
+
+2005-11-26 Benjamin "Asaru" Dirks <asaru AT wtnet.de>
+ * CONFIGURE: added PIC configure option
+
+2005-11-25 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DEPENDS: auto-created or updated
+
+2005-11-25 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS, HISTORY: created spell
diff --git a/libs/libdrm/PRE_SUB_DEPENDS b/libs/libdrm/PRE_SUB_DEPENDS
index b8aa194..10c89b6 100755
--- a/libs/libdrm/PRE_SUB_DEPENDS
+++ b/libs/libdrm/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
- NV) [[ "$LIBDRM_NV" == "y" ]] && return 0 ;;
+ NV|NOUVEAU) [[ "$LIBDRM_NV" == "y" ]] && return 0 ;;
INTEL) [[ "$LIBDRM_INTEL" == "y" ]] && return 0 ;;
RADEON) [[ "$LIBDRM_RADEON" == "y" ]] && return 0 ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
diff --git a/libs/libdrm/SUB_DEPENDS b/libs/libdrm/SUB_DEPENDS
index f0d0d9e..5db50df 100755
--- a/libs/libdrm/SUB_DEPENDS
+++ b/libs/libdrm/SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
- NV) message "${SPELL_COLOR}libdrm${DEFAULT_COLOR}${MESSAGE_COLOR}
requested with Nouveau KMS API${DEFAULT_COLOR}" &&
+ NV|NOUVEAU) message "${SPELL_COLOR}libdrm${DEFAULT_COLOR}${MESSAGE_COLOR}
requested with Nouveau KMS API${DEFAULT_COLOR}" &&
LIBDRM_NV='y'
;;
INTEL) message "${SPELL_COLOR}libdrm${DEFAULT_COLOR}${MESSAGE_COLOR}
requested with Intel KMS API${DEFAULT_COLOR}" &&
diff --git a/x11-toolkits/wxgtk/DEPENDS b/x11-toolkits/wxgtk/DEPENDS
index bf985f7..36a6323 100755
--- a/x11-toolkits/wxgtk/DEPENDS
+++ b/x11-toolkits/wxgtk/DEPENDS
@@ -22,6 +22,10 @@ optional_depends MESALIB \
'--with-opengl' \
'--without-opengl' \
'for OpenGL support' &&
+if is_depends_enabled $SPELL mesalib-1x; then
+ # New mesalib has it separated out.
+ depends glu
+fi &&
optional_depends expat \
'--with-expat' \
'--without-expat' \
diff --git a/x11-toolkits/wxgtk/HISTORY b/x11-toolkits/wxgtk/HISTORY
index 731f6a0..f58a948 100644
--- a/x11-toolkits/wxgtk/HISTORY
+++ b/x11-toolkits/wxgtk/HISTORY
@@ -1,3 +1,6 @@
+2014-04-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: ... and when MESALIB is mesalib-1x, depends on glu
+
2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: mesalib => MESALIB
- [SM-Commit] GIT changes to master grimoire by Thomas Orgis (a6753b84f253d909e6a7dc4df1cd43729fa54280), Thomas Orgis, 08/24/2014
Archive powered by MHonArc 2.6.24.