Skip to Content.
Sympa Menu

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

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 (351fbe228929d89b366db4355551af80905b1fa7)
  • Date: Tue, 10 Nov 2015 08:37:16 +0000

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

graphics-libs/opencv3/BUILD | 1 +
graphics-libs/opencv3/DETAILS | 5 +++++
graphics-libs/opencv3/HISTORY | 6 ++++++
graphics-libs/opencv3/PREPARE | 2 +-
graphics-libs/opencv3/PRE_BUILD | 2 ++
xorg-xserver/xorg-server/CONFIGURE | 6 ------
xorg-xserver/xorg-server/DEPENDS | 15 ++++++++++-----
xorg-xserver/xorg-server/DETAILS | 4 ++--
xorg-xserver/xorg-server/HISTORY | 6 ++++++
9 files changed, 33 insertions(+), 14 deletions(-)

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

xorg-server: => 1.18.0

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

pencv3 improvements

diff --git a/graphics-libs/opencv3/BUILD b/graphics-libs/opencv3/BUILD
index 5cacc56..3fe0883 100755
--- a/graphics-libs/opencv3/BUILD
+++ b/graphics-libs/opencv3/BUILD
@@ -6,6 +6,7 @@ if [[ $CV_CONTRIB != none ]];then
fi &&

OPTS+=" -DOPENCV_MODULES_DISABLED_USER_ST=\"$CV_DISABLE\""
+OPTS+=" -DIPPROOT=$SOURCE_DIRECTORY/ippicv_lnx" &&

if is_depends_enabled $SPELL qtbase;then
qt5_cmake_build
diff --git a/graphics-libs/opencv3/DETAILS b/graphics-libs/opencv3/DETAILS
index 72f154d..8898a05 100755
--- a/graphics-libs/opencv3/DETAILS
+++ b/graphics-libs/opencv3/DETAILS
@@ -1,5 +1,6 @@
SPELL=opencv3
VERSION=3.0.0
+ IPPV=20141027

SOURCE_HASH=sha512:108d0fdcc60b5688ebf61c930fb965ec81f0d3c36bb1797f6cc571fac35331f540773207fd1cb81b12c05c8f4d1af20c4a2452d9f75cd0cae4acd8131be92375
SOURCE=${SPELL//3}-$VERSION.zip
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//3}-${VERSION}
@@ -9,6 +10,10 @@ if ! list find "$CV_CONTRIB" none ;then
SOURCE2=opencv_contrib-$VERSION.tar.gz

SOURCE2_URL[0]=https://github.com/Itseez/opencv_contrib/archive/$VERSION.tar.gz
fi
+ SOURCE3=ippicv_linux_${IPPV}.tgz
+
SOURCE3_HASH=sha512:82382eff4db09bcdceb736368561794065dee92fd9283192eb5c67e48752de31ba5ea4e96f2f43960e83367620aefbcaf9d901c419d4eae150a081df518667af
+
SOURCE3_URL[0]=http://sourceforge.net/projects/opencvlibrary/files/3rdparty/ippicv/$SOURCE3
+
TMPFS=off
WEB_SITE=http://opencv.org
LICENSE[0]=BSD
diff --git a/graphics-libs/opencv3/HISTORY b/graphics-libs/opencv3/HISTORY
index c588b6c..6008fb9 100644
--- a/graphics-libs/opencv3/HISTORY
+++ b/graphics-libs/opencv3/HISTORY
@@ -1,3 +1,9 @@
+2015-11-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: add SOURCE3 for ippicv download
+ * PRE_BUILD: extract ippicv
+ * BUILD: use extracted ippicv, else cmake will download it again
+ * PREPARE: add more options
+
2015-11-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS PREPARE PRE_BUILD: support opencv_contrib

diff --git a/graphics-libs/opencv3/PREPARE b/graphics-libs/opencv3/PREPARE
index b9ca51d..400f339 100755
--- a/graphics-libs/opencv3/PREPARE
+++ b/graphics-libs/opencv3/PREPARE
@@ -1,2 +1,2 @@
source $GRIMOIRE/config_query_multi.function
-config_query_multi CV_CONTRIB "Which contributed modules" none face xphoto
+config_query_multi CV_CONTRIB "Which contributed modules" none face ximgproc
xobjdetect xphoto
diff --git a/graphics-libs/opencv3/PRE_BUILD b/graphics-libs/opencv3/PRE_BUILD
index 776b92e..245b9a0 100755
--- a/graphics-libs/opencv3/PRE_BUILD
+++ b/graphics-libs/opencv3/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+unpack_file 3 &&
if ! list_find "$CV_CONTRIB" none ;then
cd $BUILD_DIRECTORY &&
unpack_file 2 &&
diff --git a/xorg-xserver/xorg-server/CONFIGURE
b/xorg-xserver/xorg-server/CONFIGURE
index 8f1ae3a..0dc52a2 100755
--- a/xorg-xserver/xorg-server/CONFIGURE
+++ b/xorg-xserver/xorg-server/CONFIGURE
@@ -74,12 +74,6 @@ config_query_option XORG_SERVER_OPTS
\
"--disable-aiglx"
&&

config_query_option XORG_SERVER_OPTS \
- "Build GLX with Thread Local Storage support?" \
- n \
- "--enable-glx-tls" \
- "--disable-glx-tls"
&&
-
-config_query_option XORG_SERVER_OPTS \
"Build DRI extension?" \
y \
"--enable-dri" \
diff --git a/xorg-xserver/xorg-server/DEPENDS
b/xorg-xserver/xorg-server/DEPENDS
index 8b205fe..57adc13 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -51,6 +51,11 @@ optional_depends libxvmc \
"--disable-xvmc" \
"Enable support for XvMC" &&

+optional_depends LOGIN-DAEMON \
+ '--enable-systemd-logind' \
+ '--disable-systemd-logind' \
+ 'login daemon' &&
+depends dbus &&
#
# May only select one:
# configure: error: Hotplugging through both libudev and dbus/hal not allowed
@@ -60,20 +65,19 @@ optional_depends libxvmc \
#
# hal is preferred by upstream:
# --enable-config-udev Build udev support (default: auto)
-# --enable-config-dbus Build D-BUS API support (default: no)
# --disable-config-hal Build HAL support (default: auto)
#

message "You can either use hal+dbus OR udev for hotplugging" &&
message "but NOT both" &&
optional_depends hal \
- "--enable-config-hal --enable-config-dbus --disable-config-udev" \
- "--disable-config-hal --disable-config-dbus" \
+ "--enable-config-hal --disable-config-udev" \
+ "--disable-config-hal " \
"Enable HAL support" &&

if ! is_depends_enabled $SPELL hal; then
optional_depends DEVICE-MANAGER \
- "--enable-config-udev --disable-config-dbus --disable-config-hal" \
+ "--enable-config-udev --disable-config-hal" \
"--disable-config-udev" \
"enable udev kernel config support"
fi &&
@@ -163,12 +167,13 @@ depends libxtst &&

message 'additional fonts are not needed, but can be installed indiviually'
&&

-message 'choose an input driver' &&
+message 'choose an input or video driver' &&
message 'if these drivers are not suitable, choose from the xorg-drivers
section' &&

suggest_depends xf86-input-evdev '' '' 'modern input drivers' &&
suggest_depends xf86-input-synaptics '' '' 'modern input drivers' &&
suggest_depends xf86-input-libinput '' '' 'modern input drivers' &&
suggest_depends xf86-video-ati '' '' 'modern ATI drivers' &&
+suggest_depends xf86-video-amdgpu '' '' 'hardware accellerated AMD drivers'
&&
suggest_depends xf86-video-intel '' '' 'modern Intel drivers' &&
suggest_depends xf86-video-nouveau '' '' 'modern NVidia drivers'
diff --git a/xorg-xserver/xorg-server/DETAILS
b/xorg-xserver/xorg-server/DETAILS
index f71845d..031cd7e 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -1,6 +1,6 @@
SPELL=xorg-server
- VERSION=1.17.4
-
SOURCE_HASH=sha512:4b8377b86ca88f27dcf59db2996b2ee620ce6f181a37dc47600365db588d48f2f3ca66a3149e7c856e686e5783b1cccb2ba0827aa7413299163dfca869f4d376
+ VERSION=1.18.0
+
SOURCE_HASH=sha512:c7b1403e79e26ea96690f5634eb2fa424f9436a8a3c8a17779f71d254a813ae9b2ff1eb3dc8c6b4c37da125f3108ee86f6f5b1c27c1db6ab28eb6c8ee62e5768
SOURCE=$SPELL-$VERSION.tar.bz2
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/xserver/$SOURCE
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index cc88d6c..785291a 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,9 @@
+2015-11-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 1.18.0
+ * DEPENDS: add LOGIN-DAEMON, xf86-video-amdgpu, dbus
+ remove obsolete config-dbus options
+ * CONFIGURE: remove obsolete options
+
2015-10-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 1.17.4




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

Archive powered by MHonArc 2.6.24.

Top of Page