Skip to Content.
Sympa Menu

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

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 (ce0e47b8e9a2fb9a3c4f7cb7c0635b07a9d6d527)
  • Date: Mon, 6 Sep 2010 11:20:46 -0500

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

database/ibpp/DEPENDS | 2 +-
database/ibpp/HISTORY | 6 ++++++
database/ibpp/INSTALL | 2 +-
database/ibpp/Makefile | 2 +-
database/ibpp/PRE_BUILD | 4 ++++
graphics-libs/opencv/BUILD | 1 +
graphics-libs/opencv/HISTORY | 3 +++
7 files changed, 17 insertions(+), 3 deletions(-)

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

ibpp - multiple build fixes for recent g++ and firebird

commit 4d9e21a955b93f3e665b60dd91eebcf446ea919f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

opencv - fix build against recent ffmpeg

diff --git a/database/ibpp/DEPENDS b/database/ibpp/DEPENDS
index dd09885..578d508 100755
--- a/database/ibpp/DEPENDS
+++ b/database/ibpp/DEPENDS
@@ -1,3 +1,3 @@
depends g++ &&
-depends firebird
+depends FIREBIRD

diff --git a/database/ibpp/HISTORY b/database/ibpp/HISTORY
index 7b60276..41e6507 100755
--- a/database/ibpp/HISTORY
+++ b/database/ibpp/HISTORY
@@ -1,3 +1,9 @@
+2010-09-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: firebird => FIREBIRD
+ * INSTALL: another TRACK_ROOT fix
+ * PRE_BUILD: fix for gcc-4.4+
+ * Makefile: fix linking with fbclient
+
2007-03-03 Jeremy Blosser <jblosser-smgl AT firinn.org>
* INSTALL: Replace bad TRACK_ROOT usage (automated).

diff --git a/database/ibpp/INSTALL b/database/ibpp/INSTALL
index bb86d49..36c85c7 100755
--- a/database/ibpp/INSTALL
+++ b/database/ibpp/INSTALL
@@ -1,5 +1,5 @@
cd $SOURCE_DIRECTORY &&
- DEST=$TRACK_ROOT/usr/share/ibpp &&
+ DEST=$INSTALL_ROOT/usr/share/ibpp &&
mkdir -p $DEST &&
cp -r *.txt core $DEST &&
cp build/*.{so,a} $INSTALL_ROOT/usr/lib/ &&
diff --git a/database/ibpp/Makefile b/database/ibpp/Makefile
index 664f726..14b0720 100644
--- a/database/ibpp/Makefile
+++ b/database/ibpp/Makefile
@@ -84,7 +84,7 @@ CXXFLAGS =-DIBPP_LINUX -DIBPP_GCC -fPIC -I./ -I./fbheaders
$(CFLAGS)
# -lfbclient (or -lgds) is for Firebird 1.5 SS and higher
# -lfbembed is for Firebird 1.5 CS and higher
#
-LIBS+=-lfbclient -lcrypt -lm -ldl -lpthread # dependancies for shared library
+LIBS+=-L/opt/firebird/lib -lfbclient -lcrypt -lm -ldl -lpthread #
dependancies for shared library
#
TARGETS = $(TARGETDIR)/libibpp$(DS).a \
$(TARGETDIR)/libibpp$(DS).so
diff --git a/database/ibpp/PRE_BUILD b/database/ibpp/PRE_BUILD
index ab67260..172784f 100755
--- a/database/ibpp/PRE_BUILD
+++ b/database/ibpp/PRE_BUILD
@@ -1,4 +1,8 @@
mk_source_dir &&
cd $SOURCE_DIRECTORY &&
unpack_file &&
+# fix for gcc-4.4+
+sed -i '1 i\
+#include <cstring>
+' core/*ibpp.h &&
cp $SPELL_DIRECTORY/Makefile core
diff --git a/graphics-libs/opencv/BUILD b/graphics-libs/opencv/BUILD
index e013b8d..1bde1fe 100755
--- a/graphics-libs/opencv/BUILD
+++ b/graphics-libs/opencv/BUILD
@@ -1 +1,2 @@
+CXXFLAGS=-D__STDC_CONSTANT_MACROS &&
cmake_build
diff --git a/graphics-libs/opencv/HISTORY b/graphics-libs/opencv/HISTORY
index 4718918..c92dd19 100644
--- a/graphics-libs/opencv/HISTORY
+++ b/graphics-libs/opencv/HISTORY
@@ -1,3 +1,6 @@
+2010-09-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD: fix compile with recent ffmpeg
+
2010-04-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.1.0
LICENSE = BSD



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ce0e47b8e9a2fb9a3c4f7cb7c0635b07a9d6d527), Treeve Jelbert, 09/06/2010

Archive powered by MHonArc 2.6.24.

Top of Page