New commits:
commit 83d3ccc251f3796fac148ba205cfde9ec262f5dc
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
libs/openthreads: deprecated in favour of openscenegraph
commit eb9b5e0c012887eef0a4a872cf2aca6963c19820
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
libs/openproducer: version 1.1-1
commit 25f50efd4991d6a5c8b9033ddc2692e1a4810239
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
libs/openproducer: change dependency on openthreads to openscenegraph
commit b013cbb34ecd23198c902c0095779d12b52260eb
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
libs/openscenegraph: remove dependency on openthreads
commit c98227d870b4ed6a9516657bb5607a382652c42f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
libs/openscenegraph: fix compile error with recent versions of xine-lib
diff --git a/ChangeLog b/ChangeLog
index 8a2c5dd..6394f0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2012-12-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* fonts-x11/gohufont: new spell, a fix-width bitmap font
+ * libs/openthreads: spell deprecated [openthreads is part of
+ openscenegraph]
diff --git a/libs/openproducer/PRE_BUILD b/libs/openproducer/PRE_BUILD
new file mode 100755
index 0000000..bbb451c
--- /dev/null
+++ b/libs/openproducer/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SPELL_DIRECTORY}/0001-add-missing-includes.patch
diff --git a/libs/openscenegraph/DEPENDS b/libs/openscenegraph/DEPENDS
index 2ecbba8..9edd465 100755
--- a/libs/openscenegraph/DEPENDS
+++ b/libs/openscenegraph/DEPENDS
@@ -9,7 +9,6 @@ depends libxext &&
depends libice &&
depends libxml2 &&
depends libxrandr &&
-depends openthreads &&
depends tiff &&
depends unzip &&
depends zlib &&
diff --git a/libs/openscenegraph/HISTORY b/libs/openscenegraph/HISTORY
index a1f7ed3..feedeef 100644
--- a/libs/openscenegraph/HISTORY
+++ b/libs/openscenegraph/HISTORY
@@ -1,3 +1,8 @@
+2012-12-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, video_out_rgb.c.patch: add patch from gentoo to fix
+ compile error with recent versions of xine-lib
+ * DEPENDS: remove dependency on openthreads
+
2012-08-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: add dependency on legacy release of ffmpeg
* DEPENDS: changed ffmpeg sub dependency from legacy to LEGACY
diff --git a/libs/openscenegraph/PRE_BUILD b/libs/openscenegraph/PRE_BUILD
new file mode 100755
index 0000000..f75bdda
--- /dev/null
+++ b/libs/openscenegraph/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SPELL_DIRECTORY}/video_out_rgb.c.patch
diff --git a/libs/openscenegraph/video_out_rgb.c.patch
b/libs/openscenegraph/video_out_rgb.c.patch
new file mode 100644
index 0000000..86618de
--- /dev/null
+++ b/libs/openscenegraph/video_out_rgb.c.patch
@@ -0,0 +1,28 @@
+Adjust xine plugin in osg to driver class members used for xine-lib-1.2.0.
+
+2012-01-07 Martin von Gagern
+
+References:
+https://bugs.gentoo.org/397643
+http://anonscm.debian.org/hg/xine-lib/xine-lib-1.2/diff/806b590a4d38/src/xine-engine/video_out.h
+http://www.openscenegraph.org/projects/osg/browser/OpenSceneGraph/trunk/src/osgPlugins/xine
+
+Index: OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c
+===================================================================
+--- OpenSceneGraph-3.0.1.orig/src/osgPlugins/xine/video_out_rgb.c
++++ OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c
+@@ -2769,8 +2769,14 @@ init_class(xine_t* xine, void* vo_visual
+ clear(rgb_class, sizeof(rgbout_class_t));
+
+ rgb_class->driver_class.open_plugin = open_plugin;
++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 &&
XINE_MINOR_VERSION < 2)
+ rgb_class->driver_class.get_identifier = get_identifier;
+ rgb_class->driver_class.get_description = get_description;
++#else
++ rgb_class->driver_class.identifier = get_identifier(NULL);
++ rgb_class->driver_class.description = get_description(NULL);
++#endif
++
+ rgb_class->driver_class.dispose = dispose_class;
+
+ return(rgb_class);
diff --git a/libs/openthreads/BUILD b/libs/openthreads/BUILD
index 033ff63..27ba77d 100755
--- a/libs/openthreads/BUILD
+++ b/libs/openthreads/BUILD
@@ -1,2 +1 @@
-sedit "s/-O2/\"$CFLAGS\"/" Make/makedefs &&
-make opt
+true
diff --git a/libs/openthreads/DEPENDS b/libs/openthreads/DEPENDS
new file mode 100755
index 0000000..dc81ae7
--- /dev/null
+++ b/libs/openthreads/DEPENDS
@@ -0,0 +1 @@
+depends openscenegraph
diff --git a/libs/openthreads/DETAILS b/libs/openthreads/DETAILS
index a23454c..78438d9 100755
--- a/libs/openthreads/DETAILS
+++ b/libs/openthreads/DETAILS
@@ -1,40 +1,7 @@
- SPELL=openthreads
- VERSION=1.2dev2
- SOURCE=OpenThreads-v$VERSION-osg0.9.5.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/OpenThreads
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:027a5d9bd2cd6f52ffa668d1435852b8aa881cff783edcd4df9b090a3bd390ea2a238e34d49d618e50c737372097a2e50a9e36becf30a8d76204256ea8949ca9
- WEB_SITE=http://openthreads.sourceforge.net/
- ENTERED=20031208
- LICENSE[0]=LGPL
- KEYWORDS="libs"
- SHORT="Minimal and complete Object-Oriented thread interface for
C++ programmers"
-cat << EOF
-This library is intended to provide a minimal & complete Object-Oriented
-(OO) thread interface for C++ programmers. It is loosely
-modeled on the Java thread API, and the POSIX Threads standards.
-The architecture of the library is designed around "swappable"
-thread models which are defined at compile-time in a shared object library.
-It is of importance to note that while a factory
-pattern design could have been used to achieve the goal of genaric interface,
-it would have required the programmer to allocate
-each of the 4 fundemental types (Thread, Mutex, Barrier, & Condition )
-on the heap. Due to the cost associated with heap
-allocation of the underlying concrete implementations of these constructs
-on some platforms, such allocation was deemed
-unacceptable at the time this library was originally written, and thus the
-factory pattern was not used.
-
-Instead, a somewhat obtuse - but effective - technique was chosen to provide
-the necessary data/implementation hiding. This
-technique uses private void pointers to encapsulate object private data.
-The void pointers actually point at concrete data
-structures, but give a uniform interface to the dso.
-
-It is the intent of the Open Thread Group that the interfaces (header files)
-will be used to construct optimized implementations
-using platform optimized multi-processing constructs such as the sproc
-methods used on IRIX & Windows (tm) threads on that Seattle
-based platform. There are currently concrete implementations using both
-POSIX and Mircrosoft Windows (tm) Threads in CVS.
-EOF
+ SPELL=openthreads
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
+ cat << EOF
+ deprecated spell [replaced by openscenegraph]
+ EOF
diff --git a/libs/openthreads/DOWNLOAD b/libs/openthreads/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/libs/openthreads/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/libs/openthreads/HISTORY b/libs/openthreads/HISTORY
index 0c8e286..616c759 100644
--- a/libs/openthreads/HISTORY
+++ b/libs/openthreads/HISTORY
@@ -1,3 +1,8 @@
+2012-12-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * spell deprecated [openthreads is part of openscenegraph]
+ * PATCHLEVEL=9999
+ * DETAILS: version 0
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)