Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (83099b91d32f303baa4ee248e583f022f77bef68)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (83099b91d32f303baa4ee248e583f022f77bef68)
  • Date: Sat, 3 Nov 2012 10:35:08 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

ChangeLog | 4 +
dev/null |binary
graphics-libs/libxcm/DEPENDS | 11 +++
graphics-libs/libxcm/DETAILS | 26
+++++++++
graphics-libs/libxcm/HISTORY | 3 +
libs/elektra/DETAILS | 4 -
libs/elektra/HISTORY | 3 +
libs/elektra/elektra-0.6.10.tar.gz.sig | 0
libs/yajl/DETAILS | 6 +-
libs/yajl/HISTORY | 3 +
utils/oyranos/0001-remove-example-causing-install-error.patch | 28
++++++++++
utils/oyranos/DEPENDS | 27
++++++++-
utils/oyranos/DETAILS | 6 +-
utils/oyranos/HISTORY | 7 ++
utils/oyranos/PRE_BUILD | 8 +-
utils/oyranos/linking.patch | 12 ----
utils/oyranos/oyranos-0.1.7.tar.gz.sig | 0
utils/oyranos/system-elektra.patch | 16 -----
18 files changed, 120 insertions(+), 44 deletions(-)

New commits:
commit cb8088db45f962eca82c33de164a42c4c2fdab7e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/oyranos: version 0.9.0

commit 4acdd68bcf0bf0fbd227b4c23102639d01d2dbe1
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics-libs/libxcm: new spell, a reference implementation of the X
Color Management specification

commit dd3f39e9c001cb6d58c1966a2d6597779a075984
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/yajl: version 2.0.4

commit 1c57b209ec8e586f272503013194541b42354c49
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/elektra: version 0.7.0

diff --git a/ChangeLog b/ChangeLog
index fbbc9b0..83bbc94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
2012-11-02 Ladislav Hagara <hgr AT vabo.cz>
* e-17/edbus: new spell, access to D-Bus from EFL applications

+2012-11-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * graphics-libs/libxcm: new spell, a reference implementation of the X
+ Color Management specification
+
2012-10-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* graphics-libs/libopenraw: new spell, a RAW decoder

diff --git a/graphics-libs/libxcm/DEPENDS b/graphics-libs/libxcm/DEPENDS
new file mode 100755
index 0000000..6d5bb47
--- /dev/null
+++ b/graphics-libs/libxcm/DEPENDS
@@ -0,0 +1,11 @@
+depends libice &&
+depends libsm &&
+depends libx11 &&
+depends libxau &&
+depends libxcb &&
+depends libxdmcp &&
+depends libxext &&
+depends libxfixes &&
+depends libxmu &&
+depends libxt &&
+depends util-linux
diff --git a/graphics-libs/libxcm/DETAILS b/graphics-libs/libxcm/DETAILS
new file mode 100755
index 0000000..b7b77e9
--- /dev/null
+++ b/graphics-libs/libxcm/DETAILS
@@ -0,0 +1,26 @@
+ SPELL=libxcm
+ VERSION=0.5.1
+ SOURCE="libXcm-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=$SOURCEFORGE_URL/project/oyranos/libXcm/libXcm-0.5/${SOURCE}
+
SOURCE_HASH=sha512:809af120bab8a8d5d47f4b32c455e63194c399b5562dca681f76e379fef129e1fa26275870eed9fc2f185428c10f4ca6e1495eca29544f6c9ae71868ab1d7278
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/libXcm-${VERSION}"
+ WEB_SITE="http://www.freedesktop.org/wiki/OpenIcc";
+ LICENSE[0]=MIT
+ ENTERED=20121101
+ SHORT="a reference implementation of the X Color Management
specification"
+cat << EOF
+The libXcm library contains the a reference implementation of the X Color
+Management specification. The X Color Management specification allows to
+attach colour regions to X windows to communicate with colour servers.
+
+The XcmDDC API can be used to fetch a EDID data block from a monitor over a
+i2c communication. On Linux typical the i2c-dev module must be loaded to use
+this hardware data channel. The device nodes must obtain rights accessible
+to normal users.
+
+The XcmEdidParse API is for parsing EDID data blocks. A small example
+application is included.
+
+The XcmEvents API allowes to easily observe X11 colour management events.
+The included xcmsevents makes use of the XcmEvents API.
+EOF
diff --git a/graphics-libs/libxcm/HISTORY b/graphics-libs/libxcm/HISTORY
new file mode 100644
index 0000000..2a415aa
--- /dev/null
+++ b/graphics-libs/libxcm/HISTORY
@@ -0,0 +1,3 @@
+2012-11-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/libs/elektra/DETAILS b/libs/elektra/DETAILS
index 46b5b99..d3b3b6f 100755
--- a/libs/elektra/DETAILS
+++ b/libs/elektra/DETAILS
@@ -1,9 +1,9 @@
SPELL=elektra
- VERSION=0.6.10
+ VERSION=0.7.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+
SOURCE_HASH=sha512:0d4679028d7ab29f23b04945022ade795299a0608e29241d40c84498d3aa10c538dd6922415cf6b517a1d49dc1b4af16c6478d3ff15f7d939297752adf60a759
LICENSE[0]=GPL
WEB_SITE=http://elektra.sourceforge.net/
KEYWORDS="libs"
diff --git a/libs/elektra/HISTORY b/libs/elektra/HISTORY
index fc8a124..5ddb7fe 100644
--- a/libs/elektra/HISTORY
+++ b/libs/elektra/HISTORY
@@ -1,3 +1,6 @@
+2012-11-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.7.0
+
2008-04-26 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS, DEPENDS: Created

diff --git a/libs/elektra/elektra-0.6.10.tar.gz.sig
b/libs/elektra/elektra-0.6.10.tar.gz.sig
deleted file mode 100644
index c6f8223..0000000
Binary files a/libs/elektra/elektra-0.6.10.tar.gz.sig and /dev/null differ
diff --git a/libs/yajl/DETAILS b/libs/yajl/DETAILS
index 905db77..a83bf74 100755
--- a/libs/yajl/DETAILS
+++ b/libs/yajl/DETAILS
@@ -1,9 +1,9 @@
SPELL=yajl
- VERSION=2.0.1
+ VERSION=2.0.4
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=https://github.com/lloyd/${SPELL}/tarball/${VERSION}
-
SOURCE_HASH=sha512:814af18507bb2fa8f8a7f1b435562c7a4c1114d14003f5726ca06df896894fd15bd8d8bd70adbcb9f15965cafe0d2761e32b2c54ae1a47cc7335a577d8bdc5da
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/lloyd-${SPELL}-f4b2b1a"
+
SOURCE_HASH=sha512:ab99fdd6b7e6f7add5530fff2d3ac6171ed3698267016d6cd23449742d36c9d848f065ba920dc2abb934488239e11e4ceda571c05fa472ab5d3f0480e9033a13
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/lloyd-${SPELL}-fee1ebe"
WEB_SITE="https://github.com/lloyd/yajl";
LICENSE[0]=BSD/ISC
ENTERED=20110607
diff --git a/libs/yajl/HISTORY b/libs/yajl/HISTORY
index 7a52750..1a5af29 100644
--- a/libs/yajl/HISTORY
+++ b/libs/yajl/HISTORY
@@ -1,3 +1,6 @@
+2012-11-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.0.4
+
2012-05-06 Sukneet Basuta <sukneet AT sourcemage.org>
* UP_TRIGGERS: added, needed to recast dependencies
on major version change, i.e. when going from 1.0.9 to 2.0.1
diff --git a/utils/oyranos/0001-remove-example-causing-install-error.patch
b/utils/oyranos/0001-remove-example-causing-install-error.patch
new file mode 100644
index 0000000..0ccb5b8
--- /dev/null
+++ b/utils/oyranos/0001-remove-example-causing-install-error.patch
@@ -0,0 +1,28 @@
+From 8c260555811bca4ffdca3903539ba62ae71506b0 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Thu, 1 Nov 2012 09:14:28 +0100
+Subject: [PATCH] remove example causing install error
+
+---
+ makefile.in | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/makefile.in b/makefile.in
+index d8ba904..67069b4 100644
+--- a/makefile.in
++++ b/makefile.in
+@@ -1481,11 +1481,6 @@ install_bin: all oforms install_gui
+
+ # install recursive
+ install: install-main examples
+-#ifdef QT
+- $(INSTALL) -m 755 examples/xcmsevents/qcmsevents "$(DESTDIR)$(bindir)"
+- mkdir -p "$(DESTDIR)$(desktopdir)"
+- $(INSTALL) -m 644
"$(SRCDIR)/examples/xcmsevents/qcmsevents-applet.desktop"
"$(DESTDIR)$(desktopdir)"
+-#endif
+ $(INSTALL) -m 755
examples/oyranos_profile_graph/oyranos-profile-graph "$(DESTDIR)$(bindir)"
+ echo ... $@ done
+
+--
+1.8.0
+
diff --git a/utils/oyranos/DEPENDS b/utils/oyranos/DEPENDS
index 2208dda..4f153f4 100755
--- a/utils/oyranos/DEPENDS
+++ b/utils/oyranos/DEPENDS
@@ -1,7 +1,26 @@
-depends db &&
-depends elektra '--internal-elektra=no' &&
-depends -sub 'THREAD' fltk &&
-depends libxml2 &&
+depends cairo &&
+depends elektra '--internal-elektra=no' &&
+depends exiv2 &&
+depends -sub 'THREAD' fltk &&
+depends fontconfig &&
+depends -sub CXX gcc &&
+depends gettext &&
+depends lcms &&
+depends lcms2 &&
+depends libpng &&
+depends libraw &&
+depends libtool &&
+depends libx11 &&
+depends libxcm &&
+depends libxext &&
+depends libxfixes &&
+depends libxft &&
+depends libxinerama &&
+depends libxml2 &&
+depends libxrandr &&
+depends libxxf86vm &&
+depends OPENGL &&
+depends yajl &&

optional_depends doxygen \
'' \
diff --git a/utils/oyranos/DETAILS b/utils/oyranos/DETAILS
index 496d21b..5d8e8d1 100755
--- a/utils/oyranos/DETAILS
+++ b/utils/oyranos/DETAILS
@@ -1,9 +1,9 @@
SPELL=oyranos
- VERSION=0.1.7
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=0.9.0
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+
SOURCE_HASH[0]=sha512:89f2160958da792fe093159b0c3ad12d043fc2073b546a61aa884ed69a11f66da430dc90cfe9b249af5b6b75a7f755940239a1ea5cdcdf50770bda228978c6f8
LICENSE[0]=GPL2
WEB_SITE=http://www.oyranos.org/
KEYWORDS="utils"
diff --git a/utils/oyranos/HISTORY b/utils/oyranos/HISTORY
index 1f8761c..1bbdc5a 100644
--- a/utils/oyranos/HISTORY
+++ b/utils/oyranos/HISTORY
@@ -1,3 +1,10 @@
+2012-11-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.9.0
+ * system-elektra.patch, linking.patch: removed
+ * PRE_BUILD, 0001-remove-example-causing-install-error.patch:
+ fix error during install
+ * DEPENDS: adapted to new version of oyranos
+
2008-04-26 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS, DEPENDS, PRE_BUILD, system-elektra.patch, linking.patch:
Created
diff --git a/utils/oyranos/PRE_BUILD b/utils/oyranos/PRE_BUILD
index dbc7947..bccb9fc 100755
--- a/utils/oyranos/PRE_BUILD
+++ b/utils/oyranos/PRE_BUILD
@@ -1,5 +1,5 @@
default_pre_build &&
-rm -rf $SOURCE_DIRECTORY/elektra-0.6.4 &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/system-elektra.patch &&
-patch -p1 < $SCRIPT_DIRECTORY/linking.patch
+rm -rf $SOURCE_DIRECTORY/elektra-* &&
+rm -rf $SOURCE_DIRECTORY/yajl-* &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < $SCRIPT_DIRECTORY/0001-remove-example-causing-install-error.patch
diff --git a/utils/oyranos/linking.patch b/utils/oyranos/linking.patch
deleted file mode 100644
index 024b6e5..0000000
--- a/utils/oyranos/linking.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur oyranos-0.1.7.orig/makefile.in oyranos-0.1.7/makefile.in
---- oyranos-0.1.7.orig/makefile.in 2008-04-26 23:07:47.000000000 -0700
-+++ oyranos-0.1.7/makefile.in 2008-04-26 23:13:15.000000000 -0700
-@@ -31,7 +31,7 @@
- ELEKTRA_STATICTEST_LIBS = `test -f
$(ELEKTRA_VERSION)/src/libelektra/libelektra.a && echo
$(ELEKTRA_VERSION)/src/libelektra/libelektra.a || (test -f
$(libdir)/libelektra.a && (echo $(libdir)/libelektra.a ; test -f
$(libdir)/libelektra-filesys.a && echo $(libdir)/libelektra-filesys.a ||
(test -f $(libdir)/elektra/libelektra-filesys.a && echo
$(libdir)/elektra/libelektra-filesys.a)) || echo $(ELEKTRA_LIBS))`
-
- LDLIBS = $(LDFLAGS) -L$(libdir) -L. \
-- $(ELEKTRA_STATICTEST_LIBS) -lc $(I18N_LIB)
-+ $(ELEKTRA_STATICTEST_LIBS) -lc -lxml2 -ldb_cxx $(I18N_LIB)
-
-
- CPP_HEADERS = \
diff --git a/utils/oyranos/oyranos-0.1.7.tar.gz.sig
b/utils/oyranos/oyranos-0.1.7.tar.gz.sig
deleted file mode 100644
index ebafe03..0000000
Binary files a/utils/oyranos/oyranos-0.1.7.tar.gz.sig and /dev/null differ
diff --git a/utils/oyranos/system-elektra.patch
b/utils/oyranos/system-elektra.patch
deleted file mode 100644
index 1302d4e..0000000
--- a/utils/oyranos/system-elektra.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur oyranos-0.1.7.orig/configure oyranos-0.1.7/configure
---- oyranos-0.1.7.orig/configure 2008-04-26 22:30:50.719216830 -0700
-+++ oyranos-0.1.7/configure 2008-04-26 22:37:22.139469402 -0700
-@@ -409,11 +409,7 @@
- fi
- fi
-
--if [ "$internalelektra" != "no" ]; then
-- ELEKTRA_VERSION="elektra-0.6.4"
-- export ELEKTRA_VERSION
--fi
--export internalelektra
-+export internalelektra="no"
-
-
- # set some compiler and linker options



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (83099b91d32f303baa4ee248e583f022f77bef68), Florian Franzmann, 11/03/2012

Archive powered by MHonArc 2.6.24.

Top of Page