Skip to Content.
Sympa Menu

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

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 (3d9819daa180ab09661048f53893c28232a36737)
  • Date: Fri, 28 Oct 2016 07:55:38 +0000

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

graphics/libgphoto2/BUILD | 2 +-
graphics/libgphoto2/DEPENDS | 12 ++----------
graphics/libgphoto2/HISTORY | 6 ++++++
graphics/libgphoto2/PRE_BUILD | 8 +++++++-
graphics/libgphoto2/drivers | 5 +++++
graphics/libgphoto2/upddrv | 4 ++--
libs/icu/DETAILS | 8 ++++----
libs/icu/HISTORY | 3 +++
8 files changed, 30 insertions(+), 18 deletions(-)

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

libgphoto2 - fix build with jpeg-turbo

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

icu: => 58.1

diff --git a/graphics/libgphoto2/BUILD b/graphics/libgphoto2/BUILD
index 90e658a..62c9305 100755
--- a/graphics/libgphoto2/BUILD
+++ b/graphics/libgphoto2/BUILD
@@ -1,3 +1,3 @@
-OPTS="--with-drivers=$DRIVER $OPTS" &&
+OPTS="--with-camlibs=$DRIVER $OPTS" &&

default_build
diff --git a/graphics/libgphoto2/DEPENDS b/graphics/libgphoto2/DEPENDS
index e3a340c..916dd8f 100755
--- a/graphics/libgphoto2/DEPENDS
+++ b/graphics/libgphoto2/DEPENDS
@@ -7,15 +7,8 @@ if is_depends_enabled libxml2 icu;then
fi &&


-# test kernel version
-local GPH_KVER &&
-GPH_KVER=`uname -r |cut -c-3` &&
-if [[ $GPH_KVER != "2.4" ]];then
- optional_depends DEVICE-MANAGER "udevscriptdir=$INSTALL_ROOT/lib/udev"
"" \
+optional_depends DEVICE-MANAGER "udevscriptdir=$INSTALL_ROOT/lib/udev" ""
\
"for kernel UDEV support"
-else
- optional_depends hotplug "" "" "for kernel hotplug support"
-fi &&

optional_depends lockdev "" "" "serial port locking" &&
optional_depends gettext "--enable-nls" "--disable-nls" "NLS support" &&
@@ -28,10 +21,9 @@ optional_depends gd "" "" "for GD conversion support" &&
optional_depends libtool "--with-ltdl" "--without-ltdl" \
"an alternative way of opening shared libraries" &&

-optional_depends libusb-compat "" "" "enable use of cameras connected though
the USB port" &&
+optional_depends libusb "" "" "enable use of cameras connected though the
USB port" &&

optional_depends dbus "" "" "for dbus support" &&
-optional_depends hal "" "" "for HAL support" &&

# Currently broken, disabling it
# even if with current doxygen disabling hack that would be impossible to
build anyway
diff --git a/graphics/libgphoto2/HISTORY b/graphics/libgphoto2/HISTORY
index 7775ee2..40ff0cc 100644
--- a/graphics/libgphoto2/HISTORY
+++ b/graphics/libgphoto2/HISTORY
@@ -1,3 +1,9 @@
+2016-10-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * upddrv, drivers updated
+ * BUILD: cuse correct option for cameras
+ * DEPENDS: remove hal, hotplug
+ * PRE_BUILD: disable broken drivers
+
2016-04-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.5.10

diff --git a/graphics/libgphoto2/PRE_BUILD b/graphics/libgphoto2/PRE_BUILD
index 564ac0f..12048f7 100755
--- a/graphics/libgphoto2/PRE_BUILD
+++ b/graphics/libgphoto2/PRE_BUILD
@@ -1,4 +1,10 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
# TJ private patch
-patch -p1 < $SPELL_DIRECTORY/cameras.diff
+patch -p1 < $SPELL_DIRECTORY/cameras.diff &&
+
+# fix jpeg version test
+if is_depends_enabled $SPELL libjpeg-turbo;then
+ sed -i "/JPEG_LIB_VERSION/s/80/1/;/jpeg_memsrcdest.h/D"
camlibs/ax203/*.{c,h} &&
+ sed -i "/JPEG_LIB_VERSION/s/70/1/;s/jpeg_memsrcdest.h/jpeglib.h/"
camlibs/jl2005c/*.{c,h}
+fi
diff --git a/graphics/libgphoto2/drivers b/graphics/libgphoto2/drivers
index 19eb912..288b151 100644
--- a/graphics/libgphoto2/drivers
+++ b/graphics/libgphoto2/drivers
@@ -1,6 +1,7 @@
adc65
agfa_cl20
aox
+ax203
barbie
canon
casio_qv
@@ -17,6 +18,7 @@ iclick
jamcam
jd11
jl2005a
+jl2005c
kodak_dc120
kodak_dc210
kodak_dc240
@@ -35,6 +37,7 @@ panasonic_dc1000
panasonic_dc1580
pccam300
pccam600
+pentax
polaroid_pdc320
polaroid_pdc640
polaroid_pdc700
@@ -52,8 +55,10 @@ sony_dscf55
soundvision
spca50x
sq905
+st2205
stv0674
stv0680
sx330z
topfield
toshiba_pdrm11
+tp6801
diff --git a/graphics/libgphoto2/upddrv b/graphics/libgphoto2/upddrv
index e2d75a8..82881b4 100755
--- a/graphics/libgphoto2/upddrv
+++ b/graphics/libgphoto2/upddrv
@@ -1,4 +1,4 @@
-grep GP_CAMLIB /usr/src/libgphoto2-2.4.0/configure.ac |sed \
-"/obsolete/D;/DEFINE/D;s/^.*\[//;s/\].*$//">drv
+grep GP_CAMLIB /usr/src/libgphoto2-2.*/configure.ac |sed \
+"/obsolete/D;/DEFINE/D;s/^.*\[//;s/\].*$//;/WARNING/D;/unlisted/D">drv
diff -uN drivers drv|less

diff --git a/libs/icu/DETAILS b/libs/icu/DETAILS
index 196f1a0..6706ddb 100755
--- a/libs/icu/DETAILS
+++ b/libs/icu/DETAILS
@@ -1,11 +1,11 @@
SPELL=icu
if [[ "$ICU_DEV" == 'y' ]]; then
- VERSION=57.1
-
SOURCE_HASH=sha512:a3c701e9c81622db545bcf93f315c7b13159750f43f009d0aec59ceae3a8e1ccb751826d4b8a7387aca47f38bff2a85816b1a123b07d2bf731558c7b66e47b8a
+ VERSION=58,1
+
SOURCE_HASH=sha512:59b2a76834192a35125fda326587e613ef4486152cf0278c6f22568d4ae02c4b2d897efcea2654ef2b11bd1c3154aecd38cb68a70f69430736f343689f94c155
VX=${VERSION//.r/r}
else
- VERSION=57.1
-
SOURCE_HASH=sha512:a3c701e9c81622db545bcf93f315c7b13159750f43f009d0aec59ceae3a8e1ccb751826d4b8a7387aca47f38bff2a85816b1a123b07d2bf731558c7b66e47b8a
+ VERSION=58.1
+
SOURCE_HASH=sha512:59b2a76834192a35125fda326587e613ef4486152cf0278c6f22568d4ae02c4b2d897efcea2654ef2b11bd1c3154aecd38cb68a70f69430736f343689f94c155
fi
VX=$VERSION
SPELLX=icu4c
diff --git a/libs/icu/HISTORY b/libs/icu/HISTORY
index 231af24..01d260b 100644
--- a/libs/icu/HISTORY
+++ b/libs/icu/HISTORY
@@ -1,3 +1,6 @@
+2016-10-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 58.1 (both)
+
2016-03-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 57.1 (both)





Archive powered by MHonArc 2.6.24.

Top of Page