Skip to Content.
Sympa Menu

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

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 (f6a8f8e7e5d2eb53d47b9469f893e16803d793d4)
  • Date: Sat, 25 Apr 2015 08:48:28 -0500

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

CMAKE_CONFIGURE | 4 +++
ChangeLog | 7 +++++
FUNCTIONS | 29 +++++++++++++++++------
KDE5_DEPENDS | 3 ++
KDE5_FUNCTIONS | 40
++++++++++++++++++++++++++++++++
doc/qpdf/DETAILS | 4 +--
doc/qpdf/HISTORY | 3 ++
graphics-libs/mesalib/DEPENDS | 1
graphics-libs/mesalib/DETAILS | 4 +--
graphics-libs/mesalib/HISTORY | 4 +++
graphics/leptonica/DEPENDS | 12 +++++----
graphics/leptonica/DETAILS | 4 +--
graphics/leptonica/HISTORY | 6 ++++
graphics/leptonica/PRE_BUILD | 6 +---
python-pypi/sqlalchemy/DETAILS | 4 +--
python-pypi/sqlalchemy/HISTORY | 3 ++
xorg-driver/xf86-input-libinput/DETAILS | 4 +--
xorg-driver/xf86-input-libinput/HISTORY | 3 ++
xorg-xserver/xorg-server/BUILD | 2 -
xorg-xserver/xorg-server/DEPENDS | 12 ++-------
xorg-xserver/xorg-server/HISTORY | 4 +++
xorg-xserver/xorg-server/UP_TRIGGERS | 3 --
22 files changed, 124 insertions(+), 38 deletions(-)

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

improve cmake builds, allow choice of prefix
prepare for kde5 frameworks/plasma/apps

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

sqlalchemy: => 1.0.2

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

mesalib: => 10.5.4

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

xf86-input-libinput: => 0.9.0

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

xorg-server tweaks

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

qpdf: => 5.1.2

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

leptonica: => 1.71

diff --git a/CMAKE_CONFIGURE b/CMAKE_CONFIGURE
new file mode 100755
index 0000000..73089ce
--- /dev/null
+++ b/CMAKE_CONFIGURE
@@ -0,0 +1,4 @@
+config_query_list CM_BUILD_TYPE 'which build type?' Release Debug
RelWithDebInfo
+#if is_depends_enabled $SPELL extra-cmake-modules;then
+ config_query_option CM_TESTS 'build tests?' n "-DBUILD_TESTING=1"
"-DBUILD_TESTING=0"
+#fi
diff --git a/ChangeLog b/ChangeLog
index 99ccb48..2608235 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
2015-04-25 Thomas Orgis <sobukus AT sourcemage.org>
* audio-creation/musescore: new spell, for writing music scores

+2015-04-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * FUNCTIONS: allow alternate prefix for cmake builds
+ add qt5_cmake_build
+ improve qt5_build
+ * CMAKE_CONFIGURE, KDE5_DEPENDS, KDE5_FUNCTIONS:
+ for forthcoming kde5 frameworks/apps
+
2015-04-23 Thomas Orgis <sobukus AT sourcemage.org>
* utils/numactl: new spell, NUMA support
* FUNCTIONS: make waf_build more robust with differing versions of waf
diff --git a/FUNCTIONS b/FUNCTIONS
index 5a9d3c5..0fc1d49 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -3,16 +3,22 @@
. $GRIMOIRE/config_query_multi.function

QT5DIR=$INSTALL_ROOT/opt/qt5
+
qt5_build() {
- export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
- cd $SOURCE_DIRECTORY &&
- QMAKEPATH="$QT5DIR/bin"
-# in some cases, we set a symlink to python in the source directory
- PATH="$QMAKEPATH:$SOURCE_DIRECTORY:$PATH"
- qmake PREFIX=$QT5DIR $OPTS *.pro &&
+ cd $SOURCE_DIRECTORY &&
+ PATH="$QT5DIR/bin:$PATH"
+ qmake PREFIX=$QT5DIR LIBDIR=$QT5DIR/lib \
+ $OPTS $SRC/*.pro &&
make
}

+function qt5_cmake_build() {
+ PATH="$QT5DIR/bin/:$PATH"
+ export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
+ cmake_build $QT5DIR
+}
+
+

#---------------------------------------------------------------------
## This function automatically fixes any known bad paths
@@ -537,7 +543,16 @@ cmake_build() {
mkdir -p build &&
cd build &&
prepare_cmake_flags &&
- cmake -DCMAKE_INSTALL_PREFIX="$INSTALL_ROOT"/usr \
+
+ if [[ -z $1 ]];then
+ CMAKE_INSTALL_PREFIX="$INSTALL_ROOT/usr"
+ else
+ CMAKE_INSTALL_PREFIX="$1"
+ fi &&
+
+ message INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX &&
+
+ cmake -DCMAKE_INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_MANDIR=share/man \
-DCMAKE_PREFIX_PATH=share/apps/cmake/modules \
diff --git a/KDE5_DEPENDS b/KDE5_DEPENDS
new file mode 100755
index 0000000..ea4cd7b
--- /dev/null
+++ b/KDE5_DEPENDS
@@ -0,0 +1,3 @@
+depends cmake &&
+depends extra-cmake-modules &&
+depends qtbase
diff --git a/KDE5_FUNCTIONS b/KDE5_FUNCTIONS
new file mode 100755
index 0000000..af5c72c
--- /dev/null
+++ b/KDE5_FUNCTIONS
@@ -0,0 +1,40 @@
+export XDG_DATA_DIRS=$KF5DIR/share:/usr/share
+
+#---------------------------------------------------------------------
+function kde5_build() {
+ OPTS+=" -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=1 -Wno-dev $CM_TESTS"
+ qt5_cmake_build
+}
+
+
+default_build() {
+ kde5_build
+}
+
+#function default_install() {
+# cmake_install
+#}
+
+
+# we need a default_final, default_post_remove
+# so that the mime and desktop databases get updated
+update_databases() {
+local DD
+ DD=$KF5DIR
+# update-mime-database takes a long time, so only do it when needed
+ if is_depends_enabled $SPELL;then
+ update-mime-database $DD/share/mime/
+ fi
+ if [[ -e $DD/share/desktop-directories ]]; then
+ update-desktop-database $DD/share/desktop-directories
+ fi
+}
+
+default_final() {
+ update_databases
+}
+
+
+default_post_remove() {
+ update_databases
+}
diff --git a/doc/qpdf/DETAILS b/doc/qpdf/DETAILS
index 44422fd..bfa3924 100755
--- a/doc/qpdf/DETAILS
+++ b/doc/qpdf/DETAILS
@@ -1,6 +1,6 @@
SPELL=qpdf
- VERSION=5.0.0
-
SOURCE_HASH=sha512:207d5539b434cca9a7f582882786b4d5f473cd374a1a249a0d4f335c7d9ef22cdb857a32ef3e23b98b0c329191eb6c980fa576930553211ddc00dfa11416baa8
+ VERSION=5.1.2
+
SOURCE_HASH=sha512:be2fe3f1127532edc1b3d9af2d25df64c2c04c402cfef8d1ca5ed77129c2f17ef3435abb6c630b260ee4be8458984c0fbf0abfb6cda82ef4fa74dc23ca7a8864
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$VERSION/$SOURCE
diff --git a/doc/qpdf/HISTORY b/doc/qpdf/HISTORY
index ee9740c..9e7af0e 100644
--- a/doc/qpdf/HISTORY
+++ b/doc/qpdf/HISTORY
@@ -1,3 +1,6 @@
+2015-04-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.1.2
+
2013-08-06 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0]
updated spell to 5.0.0
diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index 5806e66..ae489af 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -3,6 +3,7 @@
depends -sub 'CXX' gcc &&
depends bison &&
depends flex &&
+depends gettext &&
depends dri2proto &&
depends libdrm &&
depends util-macros &&
diff --git a/graphics-libs/mesalib/DETAILS b/graphics-libs/mesalib/DETAILS
index 4a04993..016801e 100755
--- a/graphics-libs/mesalib/DETAILS
+++ b/graphics-libs/mesalib/DETAILS
@@ -7,8 +7,8 @@ if [[ "$MESALIB_BRANCH" == "scm" ]]; then
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/mesalib-git
SOURCE_IGNORE=volatile
else
- VERSION=10.5.2
-
SOURCE_HASH=sha512:306c242ea0df54cf3e491bafa85da5687c0be35ffa24c5fde8bff5134b0b952667677e3f83fa68aa44a47fd298e2072ad5a7e7e1ad0b79f56bc1d88b8738e614
+ VERSION=10.5.4
+
SOURCE_HASH=sha512:e8268b5a28eeafe03d8d8e4a1b3865e5b4a05501507d5b623f7d4c542ade3d8fa6fef2a2b6c05d6aaefa81de26365ab6bb895a0ba2a1d9c05dd1fd701bdab5f5
PATCHLEVEL=0
# VX=`echo $VERSION | cut -d. -f-2`
SX=mesa-${VERSION}
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 6934cd2..121ea09 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,7 @@
+2015-04-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 10.5.4
+ * DEPENDS: add gettext
+
2015-04-24 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: I beg to differ. The mesalib build I see really, really
wants mako and python (python2, to be specific)!
diff --git a/graphics/leptonica/DEPENDS b/graphics/leptonica/DEPENDS
index 7ef30ab..84b2e23 100755
--- a/graphics/leptonica/DEPENDS
+++ b/graphics/leptonica/DEPENDS
@@ -1,5 +1,7 @@
-optional_depends GIFLIB '' '--without-giflib' &&
-optional_depends JPEG '' '' 'JPEG support' &&
-optional_depends libpng '' '' 'PNG support' &&
-optional_depends tiff '' '--without-libtiff' 'TIFF support' &&
-optional_depends zlib '' '--without-zlib' 'Zlib compression'
+optional_depends GIFLIB '' '--without-giflib' 'GIF support' &&
+optional_depends JPEG '' '--without-jpeg' 'JPEG support' &&
+optional_depends libpng '' '--without-libpng' 'PNG support' &&
+optional_depends libwebp '' '--without-libwebp' 'WebP support' &&
+optional_depends openjpeg '' '--without-libopenjpeg' 'OpenJPEG support' &&
+optional_depends tiff '' '--without-libtiff' 'TIFF support' &&
+optional_depends zlib '' '--without-zlib' 'Zlib compression'
diff --git a/graphics/leptonica/DETAILS b/graphics/leptonica/DETAILS
index b729204..e038a46 100755
--- a/graphics/leptonica/DETAILS
+++ b/graphics/leptonica/DETAILS
@@ -1,6 +1,6 @@
SPELL=leptonica
- VERSION=1.70
-
SOURCE_HASH=sha512:6a0769b4ff646c84582c3c81d770e72b282d941f88fa9e46548705cd4850d48a40f0af0829903cd917319c872f4679caa98bde556fa753eff65f3e9fc3679084
+ VERSION=1.71
+
SOURCE_HASH=sha512:fd02eec19a442d767ba39ce01132ef1304a977e038bdbf64ec5e763607d51adf1c06aaa687fc3ec542854e535618b6da2042f10709286c2e1d236e43d77efd51
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://leptonica.org
diff --git a/graphics/leptonica/HISTORY b/graphics/leptonica/HISTORY
index 3ae7253..727d607 100644
--- a/graphics/leptonica/HISTORY
+++ b/graphics/leptonica/HISTORY
@@ -1,3 +1,9 @@
+2015-04-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.71
+ * DEPENDS: add openjpeg, libwebp
+ fix flags
+ * PRE_BUILD: added, fix openjpeg usage
+
2014-05-29 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: giflib => GIFLIB

diff --git a/graphics/leptonica/PRE_BUILD b/graphics/leptonica/PRE_BUILD
index 209ed4d..d6e3821 100755
--- a/graphics/leptonica/PRE_BUILD
+++ b/graphics/leptonica/PRE_BUILD
@@ -1,6 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-# fix for linpng-1.5.5
-sed -i '/png.h/i \
-#include "zlib.h"
-' src/pngio.c src/libversions.c
+# fix openjpeg usage
+sed -i "s|openjpeg-2.1/||" src/jp2kio.c src/libversions.c
diff --git a/python-pypi/sqlalchemy/DETAILS b/python-pypi/sqlalchemy/DETAILS
index e974ae4..2965d38 100755
--- a/python-pypi/sqlalchemy/DETAILS
+++ b/python-pypi/sqlalchemy/DETAILS
@@ -1,7 +1,7 @@
SPELL=sqlalchemy
CHEESESHOP_PKG=SQLAlchemy
- VERSION=1.0.0
-
SOURCE_HASH=sha512:87c8d01d9b87748b8c374f64fa2978a093c9e130437c627922d9f92e2c9a97182cb596353f4f567a6594fe7229ae69bc681cc58d1d06fdf8dad07c0c29c681b4
+ VERSION=1.0.2
+
SOURCE_HASH=sha512:4894189ef408f28ba6d478779e6b2ee279edfba019329e243c5f5e513edc0e89311bcef57ee967b10057f9b2ffb848890a667e4821f678f5e0dea26f4e1b1ab0
SOURCE="$CHEESESHOP_PKG-$VERSION.tar.gz"

SOURCE_URL[0]=http://pypi.python.org/packages/source/S/$CHEESESHOP_PKG/$SOURCE
SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/python-pypi/sqlalchemy/HISTORY b/python-pypi/sqlalchemy/HISTORY
index fd17b1a..e246b2e 100644
--- a/python-pypi/sqlalchemy/HISTORY
+++ b/python-pypi/sqlalchemy/HISTORY
@@ -1,3 +1,6 @@
+2015-04-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.2
+
2015-04-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.0

diff --git a/xorg-driver/xf86-input-libinput/DETAILS
b/xorg-driver/xf86-input-libinput/DETAILS
index cd2bb81..bccab3e 100755
--- a/xorg-driver/xf86-input-libinput/DETAILS
+++ b/xorg-driver/xf86-input-libinput/DETAILS
@@ -1,6 +1,6 @@
SPELL=xf86-input-libinput
- VERSION=0.8.0
-
SOURCE_HASH=sha512:44d2c77b2cc9b29151f90458dbd6fb61b6cdfb23c878ea553e7b96f1085cd547080ab3afe804d0b6cb4d806ae2c9a4c4594b0164a54f3f44741016ec918b9d0e
+ VERSION=0.9.0
+
SOURCE_HASH=sha512:9f34966f93b6e7e98b1a358aade80cfc30320c874772c62de73451c06bf3bf0f0a36cf7a2f5edce550ddb933ecdff1e747277a131edbc82782b62402a08ae6a6
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/${SOURCE}
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/xorg-driver/xf86-input-libinput/HISTORY
b/xorg-driver/xf86-input-libinput/HISTORY
index 9c9bcd2..9045079 100644
--- a/xorg-driver/xf86-input-libinput/HISTORY
+++ b/xorg-driver/xf86-input-libinput/HISTORY
@@ -1,3 +1,6 @@
+2015-04-04-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.0
+
2015-03-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.8.0

diff --git a/xorg-xserver/xorg-server/BUILD b/xorg-xserver/xorg-server/BUILD
index e8f28bc..90d8cae 100755
--- a/xorg-xserver/xorg-server/BUILD
+++ b/xorg-xserver/xorg-server/BUILD
@@ -14,7 +14,7 @@ CXXFLAGS="${CXXFLAGS/-O3/-O0}"
fi &&
VGC=$(installed_version gcc) &&
VGC=${VGC%.?} &&
-if [[ "${VGC}" == "4.7" ]] ; then
+if [[ "${VGC}" == "4.7" ]] || [[ "${VGC}" == "5.1" ]] ; then
CFLAGS+=" -Wno-error=array-bounds"
fi &&
message CFLAGS=$CFLAGS
diff --git a/xorg-xserver/xorg-server/DEPENDS
b/xorg-xserver/xorg-server/DEPENDS
index 1de20a2..0ffa9f1 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -24,16 +24,11 @@ depends presentproto &&
#
##Check this on updates
depends libxv "--enable-xv" &&
-# workaround until: https://bugs.freedesktop.org/show_bug.cgi?id=6009
-# get's fixed, bug still on hold 2009-02-28
-if list_find "$XORG_SERVER_OPTS" "--enable-dri"; then
- depends libxinerama '--enable-xinerama'
-else
- optional_depends libxinerama \
+
+optional_depends libxinerama \
"--enable-xinerama" \
"--disable-xinerama" \
- "Build Xinerama extension"
-fi &&
+ "Multi screen support" &&
##
optional_depends libselinux \
"" \
@@ -145,7 +140,6 @@ depends xf86bigfontproto &&
depends xf86dgaproto &&
depends xf86driproto &&
depends xf86vidmodeproto &&
-depends xineramaproto &&
depends xproto &&
depends xproxymanagementprotocol &&
depends libxkbui &&
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index e668893..3010edc 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -2,6 +2,10 @@
* CONFIGURE: added selection of SHA1 implementation
* DEPENDS: fixed dependencies on a crypto library

+2015-04-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * UP_TRIGGERS: remove things which do not depend on xorg-server
+ * DEPENDS: libxinerama is optional
+
2015-02-11 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: UDEV -> DEVICE-MANAGER

diff --git a/xorg-xserver/xorg-server/UP_TRIGGERS
b/xorg-xserver/xorg-server/UP_TRIGGERS
index 734d31c..d5b34ef 100755
--- a/xorg-xserver/xorg-server/UP_TRIGGERS
+++ b/xorg-xserver/xorg-server/UP_TRIGGERS
@@ -7,8 +7,7 @@ case "$(installed_version $SPELL)" in
esac &&

for each in synaptics $(gaze -q -g "$(gaze -q grimoires | tr " " "\n" | \
- grep -Ex "test|stable(-rc|-[0-9]+\.[0-9]+)?")" section xorg-driver) \
- xkbutils xkbcomp xkbprint xkbevd xkeyboard-config setxkbmap; do
+ grep -Ex "test|stable(-rc|-[0-9]+\.[0-9]+)?")" section xorg-driver);do
if spell_ok $each; then
if [[ $epicfail == y ]]; then
up_trigger $each cast_self



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (f6a8f8e7e5d2eb53d47b9469f893e16803d793d4), Treeve Jelbert, 04/25/2015

Archive powered by MHonArc 2.6.24.

Top of Page