sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (75ede7a2f2fc09119b896bf7f7b127135c6345f6)

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 (75ede7a2f2fc09119b896bf7f7b127135c6345f6)
Date: Tue, 3 May 2016 20:21:34 +0000

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

devel/doxygen/BUILD | 10 +++++-----
devel/doxygen/CONFIGURE | 3 ++-
devel/doxygen/DEPENDS | 7 +++----
devel/doxygen/DETAILS | 4 ++--
devel/doxygen/HISTORY | 4 ++++
devel/doxygen/INSTALL | 2 +-
devel/doxygen/PRE_BUILD | 18 ++++--------------
video-libs/libdvbpsi/DETAILS | 4 ++--
video-libs/libdvbpsi/HISTORY | 3 +++
9 files changed, 26 insertions(+), 29 deletions(-)

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

doxygen: => 1.8.11

commit 5b6c3c8778d33ac3a13f7cf618ab97e394a5db26
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libdvbpsi: => 1.3.0

diff --git a/devel/doxygen/BUILD b/devel/doxygen/BUILD
index 3313b84..cadf23c 100755
--- a/devel/doxygen/BUILD
+++ b/devel/doxygen/BUILD
@@ -1,5 +1,5 @@
-QTDIR="${QTDIR:-$INSTALL_ROOT/usr}" \
-OPTS="$ENGLISH $OPTS" \
-./configure --prefix "$INSTALL_ROOT/usr" \
- $OPTS &&
-make
+OPTS="$ENGLISH_ONLY $OPTS"
+if is_depends_enabled $SPELL qtbase;then
+ PATH="$QT5DIR/bin/:$PATH"
+fi &&
+cmake_build
diff --git a/devel/doxygen/CONFIGURE b/devel/doxygen/CONFIGURE
index ac4fa24..0525d8f 100755
--- a/devel/doxygen/CONFIGURE
+++ b/devel/doxygen/CONFIGURE
@@ -1 +1,2 @@
-config_query_option ENGLISH "only support English documents?" y
"--english-only" ""
+source $GRIMOIRE/CMAKE_CONFIGURE &&
+config_query_option ENGLISH_ONLY "only support English documents?" y "
-Denglish_only=1" ""
diff --git a/devel/doxygen/DEPENDS b/devel/doxygen/DEPENDS
index 31c9f35..807b17d 100755
--- a/devel/doxygen/DEPENDS
+++ b/devel/doxygen/DEPENDS
@@ -1,6 +1,8 @@
+source $GRIMOIRE/CMAKE_DEPENDS &&
depends bison &&
depends flex &&
depends perl &&
+depends PYTHON &&
depends -sub CXX gcc &&

optional_depends graphviz \
@@ -13,10 +15,7 @@ optional_depends texlive
\
"" \
"for generating LaTeX, Postscript, and PDF output" &&

-optional_depends qt4 \
- "--with-doxywizard" \
- "" \
- "for DoxyWizard GUI" &&
+optional_depends qtbase ' -Dbuild_wizard=1' '' 'for DoxyWizard GUI' &&
optional_depends POSTSCRIPT-INTERPRETER \
"" \
"" \
diff --git a/devel/doxygen/DETAILS b/devel/doxygen/DETAILS
index 06d891d..a49710e 100755
--- a/devel/doxygen/DETAILS
+++ b/devel/doxygen/DETAILS
@@ -1,6 +1,6 @@
SPELL=doxygen
- VERSION=1.8.9.1
-
SOURCE_HASH=sha512:b76d06fc6e22d5e8e2b73814bc99cc0cf75ddf4e5a6ad1bd79832f12ccce5ccc2681777862b9ad0dbfdf1791fd1ce1f0f5ce669a78c7d38f91b0e8d5ebda8ade
+ VERSION=1.8.11
+
SOURCE_HASH=sha512:44f3f9d2715c4cfe628b988809a6264681c43634dfa830f604b6cc853fa6679eca112cc9c01cee5b019f7f01f0a0acdf4f7d3aaec0848783399d17904caf1a3e
SOURCE=$SPELL-$VERSION.src.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.stack.nl/pub/users/dimitri/$SOURCE
diff --git a/devel/doxygen/HISTORY b/devel/doxygen/HISTORY
index 3da4f2e..39e2c02 100644
--- a/devel/doxygen/HISTORY
+++ b/devel/doxygen/HISTORY
@@ -1,3 +1,7 @@
+2016-05-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.8.11
+ * CONFIGURE DEPENDS BUILD INSTALL: adapt to cmake build, use qt5
+
2015-02-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.8.9.1

diff --git a/devel/doxygen/INSTALL b/devel/doxygen/INSTALL
index 68032d3..157bcdc 100755
--- a/devel/doxygen/INSTALL
+++ b/devel/doxygen/INSTALL
@@ -1 +1 @@
-make MAN1DIR=share/man/man1 install
+cmake_install
diff --git a/devel/doxygen/PRE_BUILD b/devel/doxygen/PRE_BUILD
index 37704ea..4ccc290 100755
--- a/devel/doxygen/PRE_BUILD
+++ b/devel/doxygen/PRE_BUILD
@@ -1,14 +1,4 @@
-default_pre_build
&&
-cd ${SOURCE_DIRECTORY}
&&
-sedit "s/grep fileutils/grep 'Free Software Foundation'/" ./configure
&&
-CFLAGS="${CFLAGS//-O3/-O2}"
&&
-sedit "s/-O2/$CFLAGS/" tmake/lib/linux-g++/tmake.conf
&&
-sedit "s: = moc: = qt4/moc:" tmake/lib/linux-g++/tmake.conf &&
-sedit "s/\$(QTDIR)\/include/\$(QTDIR)\/include\/qt/"
tmake/lib/linux-g++/tmake.conf &&
-sedit "s:man/man1:share/man/man1:" Makefile.in &&
-
-
-if is_depends_enabled $SPELL qt4; then
- patch -p0 < $SCRIPT_DIRECTORY/moc.patch
- patch -p0 < $SCRIPT_DIRECTORY/doxygen-qt4.patch
-fi
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+# fix ninja error
+sed -i 's/$(LEX/$$(LEX/;s/$(Y/$$(Y/' src/CMakeLists.txt
addon/doxywizard/CMakeLists.txt
diff --git a/video-libs/libdvbpsi/DETAILS b/video-libs/libdvbpsi/DETAILS
index 52e91cb..c7f89f5 100755
--- a/video-libs/libdvbpsi/DETAILS
+++ b/video-libs/libdvbpsi/DETAILS
@@ -1,6 +1,6 @@
SPELL=libdvbpsi
- VERSION=1.2.0
-
SOURCE_HASH=sha512:951db13f5645d4d6a160719fc6ac97fd31a32d5d17cb8e26db94702e65b6fac3d4e7a99c3c417e09fe5ce33f3b0c0ef86206c77b36816dcd8a3bd5b0bb4a9684
+ VERSION=1.3.0
+
SOURCE_HASH=sha512:59f097a1032e8cf461210128c7468da4204f077a61f68f2be3310e60004774157335cd7cba82271fcc89b7b6b17a12a06b6214357227ec9976281d9b50565c54
SOURCE=${SPELL}-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-$VERSION
SOURCE_URL[0]=http://download.videolan.org/pub/$SPELL/$VERSION/$SOURCE
diff --git a/video-libs/libdvbpsi/HISTORY b/video-libs/libdvbpsi/HISTORY
index 605ed00..ab2149b 100644
--- a/video-libs/libdvbpsi/HISTORY
+++ b/video-libs/libdvbpsi/HISTORY
@@ -1,3 +1,6 @@
+2016-05-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3.0
+
2014-04-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2.0

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (75ede7a2f2fc09119b896bf7f7b127135c6345f6), Treeve Jelbert, 05/03/2016