sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Florian Franzmann (83d3ccc251f3796fac148ba205cfde9ec262f5dc)
- 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 (83d3ccc251f3796fac148ba205cfde9ec262f5dc)
- Date: Sun, 30 Dec 2012 16:52:35 -0600
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:
ChangeLog | 2
libs/openproducer/0001-add-missing-includes.patch | 90
++++++++++++++++++++++
libs/openproducer/BUILD | 2
libs/openproducer/DEPENDS | 2
libs/openproducer/DETAILS | 9 +-
libs/openproducer/HISTORY | 6 +
libs/openproducer/PRE_BUILD | 3
libs/openscenegraph/DEPENDS | 1
libs/openscenegraph/HISTORY | 5 +
libs/openscenegraph/PRE_BUILD | 3
libs/openscenegraph/video_out_rgb.c.patch | 28 ++++++
libs/openthreads/BUILD | 3
libs/openthreads/DEPENDS | 1
libs/openthreads/DETAILS | 47 +----------
libs/openthreads/DOWNLOAD | 1
libs/openthreads/HISTORY | 5 +
libs/openthreads/INSTALL | 2
libs/openthreads/PRE_BUILD | 4
libs/openthreads/TRIGGERS | 1
libs/openthreads/makerules.diff | 16 ---
20 files changed, 162 insertions(+), 69 deletions(-)
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]
2012-12-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* utils/linuxconsoletools: new spell, replacement for utils/joystick
diff --git a/libs/openproducer/0001-add-missing-includes.patch
b/libs/openproducer/0001-add-missing-includes.patch
new file mode 100644
index 0000000..1c58609
--- /dev/null
+++ b/libs/openproducer/0001-add-missing-includes.patch
@@ -0,0 +1,90 @@
+From 49e2eca3dd93e41a6bba02b2d4203d6488832900 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Sun, 30 Dec 2012 23:16:50 +0100
+Subject: [PATCH] add missing includes
+
+---
+ include/Producer/Camera | 1 +
+ src/CameraConfig.cpp | 1 +
+ src/ConfigParser.cpp | 1 +
+ src/KeyboardMouse.cpp | 1 +
+ src/RenderSurface.cpp | 2 ++
+ src/Version.cpp | 1 +
+ 6 files changed, 7 insertions(+)
+
+diff --git a/include/Producer/Camera b/include/Producer/Camera
+index 131b717..ce26ee9 100644
+--- a/include/Producer/Camera
++++ b/include/Producer/Camera
+@@ -18,6 +18,7 @@
+ #include <Producer/Referenced>
+
+ #include <vector>
++#include <string.h>
+
+ #include <Producer/RefOpenThreads>
+
+diff --git a/src/CameraConfig.cpp b/src/CameraConfig.cpp
+index 09bdfeb..9090fe3 100644
+--- a/src/CameraConfig.cpp
++++ b/src/CameraConfig.cpp
+@@ -28,6 +28,7 @@
+ #endif
+
+ #include <math.h>
++#include <string.h>
+
+ #include <Producer/Math>
+ #include <Producer/CameraConfig>
+diff --git a/src/ConfigParser.cpp b/src/ConfigParser.cpp
+index bfcc0d4..352afe9 100644
+--- a/src/ConfigParser.cpp
++++ b/src/ConfigParser.cpp
+@@ -55,6 +55,7 @@
+ #define yydebug ConfigParser_debug
+ #define yynerrs ConfigParser_nerrs
+
++#include <string.h>
+
+ /* Tokens. */
+ #ifndef YYTOKENTYPE
+diff --git a/src/KeyboardMouse.cpp b/src/KeyboardMouse.cpp
+index 0097f1f..e187264 100644
+--- a/src/KeyboardMouse.cpp
++++ b/src/KeyboardMouse.cpp
+@@ -39,6 +39,7 @@
+ #include <algorithm>
+
+ #include <float.h>
++#include <string.h>
+
+ #define TIMER_ID 555
+
+diff --git a/src/RenderSurface.cpp b/src/RenderSurface.cpp
+index 00bb240..dc6ad53 100644
+--- a/src/RenderSurface.cpp
++++ b/src/RenderSurface.cpp
+@@ -12,6 +12,8 @@
+ */
+
+ #include <Producer/RenderSurface>
++#include <stdlib.h>
++#include <string.h>
+
+ using namespace std;
+ using namespace Producer;
+diff --git a/src/Version.cpp b/src/Version.cpp
+index 03c428c..a7caba6 100644
+--- a/src/Version.cpp
++++ b/src/Version.cpp
+@@ -13,6 +13,7 @@
+
+ #include <string>
+ #include <Producer/Version>
++#include <stdlib.h>
+
+ using namespace Producer;
+
+--
+1.8.0.3
+
diff --git a/libs/openproducer/BUILD b/libs/openproducer/BUILD
index d92a530..217bd05 100755
--- a/libs/openproducer/BUILD
+++ b/libs/openproducer/BUILD
@@ -4,4 +4,4 @@ for i in $(grep -rl YieldCurrentThread .)
do
sedit "s/YieldCurrentThread/CurrentThread/" $i
done &&
-make
+default_build_make
diff --git a/libs/openproducer/DEPENDS b/libs/openproducer/DEPENDS
index cc14a0a..e748f04 100755
--- a/libs/openproducer/DEPENDS
+++ b/libs/openproducer/DEPENDS
@@ -1,2 +1,2 @@
depends xorg-libs &&
-depends openthreads
+depends openscenegraph
diff --git a/libs/openproducer/DETAILS b/libs/openproducer/DETAILS
index a232738..4fc094f 100755
--- a/libs/openproducer/DETAILS
+++ b/libs/openproducer/DETAILS
@@ -1,9 +1,10 @@
SPELL=openproducer
- VERSION=0.8.4-2
+ VERSION=1.1-1
+ PATCHLEVEL=1
SOURCE=Producer-${VERSION}.tar.gz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/Producer
- SOURCE_URL[0]=http://www.andesengineering.com/Producer/Download/${SOURCE}
-
SOURCE_HASH=sha512:856a81001079326581f5439eec26f4be2eccc272d86166e238e652196790e166a834d34cb9a4374470adf265f70b13db79160f6a1be23a7fcbe04bf472fbb47b
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/Producer-${VERSION}
+
SOURCE_URL[0]=http://www.andesengineering.com/Producer/Download/Releases/${SOURCE}
+
SOURCE_HASH=sha512:2c825e125571c692e00a11af22de57ba27c5d823395d66625c853e587b6ba840397833bb5b796525d8d1e56dfd5726b855d4c980d3e6b9ead1cefe926b1f7af8
WEB_SITE=http://www.andesengineering.com/Producer/index.html
ENTERED=20030625
UPDATED=20031208
diff --git a/libs/openproducer/HISTORY b/libs/openproducer/HISTORY
index c2c41af..f309d2e 100644
--- a/libs/openproducer/HISTORY
+++ b/libs/openproducer/HISTORY
@@ -1,3 +1,9 @@
+2012-12-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.1-1
+ * BUILD: use default_build_make
+ * DEPENDS: changed dependency on openthreads to openscenegraph
+ * 0001-add-missing-includes.patch, PRE_BUILD: fix compile errors
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)
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)
diff --git a/libs/openthreads/INSTALL b/libs/openthreads/INSTALL
index 22a7d24..27ba77d 100755
--- a/libs/openthreads/INSTALL
+++ b/libs/openthreads/INSTALL
@@ -1 +1 @@
-make INST_LOCATION=${INSTALL_ROOT}/usr install
+true
diff --git a/libs/openthreads/PRE_BUILD b/libs/openthreads/PRE_BUILD
index 73115fc..27ba77d 100755
--- a/libs/openthreads/PRE_BUILD
+++ b/libs/openthreads/PRE_BUILD
@@ -1,3 +1 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 < ${SCRIPT_DIRECTORY}/makerules.diff
+true
diff --git a/libs/openthreads/TRIGGERS b/libs/openthreads/TRIGGERS
new file mode 100755
index 0000000..e4cc722
--- /dev/null
+++ b/libs/openthreads/TRIGGERS
@@ -0,0 +1 @@
+on_cast openthreads dispel_self
diff --git a/libs/openthreads/makerules.diff b/libs/openthreads/makerules.diff
deleted file mode 100644
index b3cbd23..0000000
--- a/libs/openthreads/makerules.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- OpenThreads/Make/makerules.orig 2011-03-07 09:08:55.464739676 +0100
-+++ OpenThreads/Make/makerules 2011-03-07 09:09:22.167351881 +0100
-@@ -71,11 +71,11 @@
-
- $(EXEC:=.dbg) :
- @[ -d $(DEBUGDIR) ] || mkdir $(DEBUGDIR)
-- @cd $(DEBUGDIR); \
-+ @cd $(DEBUGDIR); \
- $(MAKE) -f ../GNUmakefile "DOF=$(DBGF)" TOPDIR=../${TOPDIR} \
- THISDIR=../$(THISDIR)\
- MAKEDEPEND=Makedepend $(EXEC)
-- @$(MAKE) LNSRC=$(DEBUGDIR)/$(EXEC)
LNDEST=$(BININST)/$(OS)$(ARCH)/$(EXEC) __link
-+ @$(MAKE) LNSRC=$(DEBUGDIR)/$(EXEC)
LNDEST=$(BININST)/$(OS)$(ARCH)/$(EXEC) __link
-
-
- $(LIB:=.dbg) :
- [SM-Commit] GIT changes to master grimoire by Florian Franzmann (83d3ccc251f3796fac148ba205cfde9ec262f5dc), Florian Franzmann, 12/30/2012
Archive powered by MHonArc 2.6.24.