Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (4385db6d0c99d3c34b6983e2e9be67dc7aca0a95)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (4385db6d0c99d3c34b6983e2e9be67dc7aca0a95)
  • Date: Fri, 7 Apr 2017 07:57:23 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

dev/null |binary
graphics/povray/BUILD | 1 -
graphics/povray/DETAILS | 8 ++++----
graphics/povray/HISTORY | 7 +++++++
graphics/povray/PRE_BUILD | 10 +++-------
graphics/povray/TRIGGERS | 1 -
printer/ghostscript/DETAILS | 1 +
printer/ghostscript/HISTORY | 5 +++++
printer/ghostscript/PRE_BUILD | 2 +-
video/mkvtoolnix/BUILD | 16 ++++++++--------
video/mkvtoolnix/DEPENDS | 11 +++++++----
video/mkvtoolnix/DETAILS | 4 ++--
video/mkvtoolnix/HISTORY | 4 ++++
video/mkvtoolnix/INSTALL | 2 +-
14 files changed, 43 insertions(+), 29 deletions(-)

New commits:
commit 4385db6d0c99d3c34b6983e2e9be67dc7aca0a95
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

ghostscript: fix cups driver support

commit 21385b6a351c6ed37adba45429fbcc87c2a43937
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

mkvtoolnix: version 9.9.0

commit 6b3ffeaf0dc021e66fd1feab040ed784185e3014
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

povray: Update to 3.7.1-beta.5 to fix broken build with current gcc/boost

This removes cruft from the spell and makes things work at all again
(patching
was not trivial). Given the glacial pace of povray development, using the
fifth beta is closer to a stable release than many stable releases of
other
projects ...

diff --git a/graphics/povray/BUILD b/graphics/povray/BUILD
index 70b3399..a641fd5 100755
--- a/graphics/povray/BUILD
+++ b/graphics/povray/BUILD
@@ -1,5 +1,4 @@
./configure --prefix="${INSTALL_ROOT}/usr" \
COMPILED_BY='graphics AT sourcemage.org' \
- LIBS='-lboost_system -lboost_thread' \
${OPTS} &&
make
diff --git a/graphics/povray/DETAILS b/graphics/povray/DETAILS
index 99a987c..1703daf 100755
--- a/graphics/povray/DETAILS
+++ b/graphics/povray/DETAILS
@@ -1,10 +1,10 @@
SPELL=povray
- VERSION=3.7.0.0
- SOURCE=$SPELL-${VERSION%.1}.tar.bz2
+ VERSION=3.7.1-beta.5
+ SOURCE=$SPELL-${VERSION%.1}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://github.com/POV-Ray/povray/archive/v${VERSION}.tar.gz
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
-#
SOURCE_HASH=sha512:400bbf5c15fff7ca98087a49e8492d332967f33d628a3bd3d4ddc3bdd8b2957113b6f12cb11216cbb1d6241a1aa4af2c83a0dbb5e86ebe398bc706b88fbf10fb
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+
SOURCE_HASH=sha512:6f4d0055b382b1b3297c92990d1c4784f477e30deba10339a9b6ab44de61eefd091aad2e70bc4e21a9db1cd1b40d397cf0fa3b0899cdd1bab5958c3e147ea70a
WEB_SITE=http://www.povray.org
ENTERED=20020415
LICENSE[0]='AGPL3'
diff --git a/graphics/povray/HISTORY b/graphics/povray/HISTORY
index b4549a4..862f0c2 100644
--- a/graphics/povray/HISTORY
+++ b/graphics/povray/HISTORY
@@ -1,3 +1,10 @@
+2017-04-07 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: update to 3.7.1-beta.5 to fix build
+ * *.sig: removed, using hash
+ * PRE_BUILD: no hacking needed anymore
+ * BUILD: boost libs found now
+ * TRIGGERS: Removed. If zlib breaks things, zlib should trigger UP.
+
2016-04-03 Thomas Orgis <sobukus AT sourcemage.org>
* PREPARE: gone (broke build in grimoire)

diff --git a/graphics/povray/PRE_BUILD b/graphics/povray/PRE_BUILD
index 64fdf83..b90325c 100755
--- a/graphics/povray/PRE_BUILD
+++ b/graphics/povray/PRE_BUILD
@@ -1,10 +1,6 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}"/unix &&
-# From
http://news.povray.org/povray.unix/thread/%3Cweb.52810591323e085d7a3e03fe0 AT news.povray.org%3E/
-# configuring the configure scripts that configure configure before
compiling with make
-sedit 's/automake --w/automake --add-missing --w/g' prebuild.sh &&
-sedit 's/dist-bzip2/dist-bzip2 subdir-objects/g' configure.ac &&
-
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+cd unix &&
# Prepare to prepare
./prebuild.sh &&
cd "${SOURCE_DIRECTORY}" &&
diff --git a/graphics/povray/TRIGGERS b/graphics/povray/TRIGGERS
deleted file mode 100755
index 0bff07e..0000000
--- a/graphics/povray/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast zlib cast_self
diff --git a/graphics/povray/povray-3.7.0.0.tar.bz2.sig
b/graphics/povray/povray-3.7.0.0.tar.bz2.sig
deleted file mode 100644
index c0fe172..0000000
Binary files a/graphics/povray/povray-3.7.0.0.tar.bz2.sig and /dev/null differ
diff --git a/printer/ghostscript/DETAILS b/printer/ghostscript/DETAILS
index 4b940ae..0b08eb0 100755
--- a/printer/ghostscript/DETAILS
+++ b/printer/ghostscript/DETAILS
@@ -8,6 +8,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
LICENSE[0]="AGPL"
ENTERED=20010922
SECURITY_PATCH=1
+ PATCHLEVEL=1
KEYWORDS="interpreter postscript printer"
SHORT="interpreter for the PostScript language"
cat << EOF
diff --git a/printer/ghostscript/HISTORY b/printer/ghostscript/HISTORY
index 42aa12a..4c81d0d 100644
--- a/printer/ghostscript/HISTORY
+++ b/printer/ghostscript/HISTORY
@@ -1,3 +1,8 @@
+2017-04-02 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: Do not remove cups dir, prevents usage of _any_ cups.
+ This is sort of needed to be able to print using some drivers at
least.
+ * DETAILS: PATCHLEVEL++
+
2017-03-19 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 9.21, removed VX, switched to UPSTREAM_HASH sha1,
changed license to AGPL
diff --git a/printer/ghostscript/PRE_BUILD b/printer/ghostscript/PRE_BUILD
index b5da632..712e3f3 100755
--- a/printer/ghostscript/PRE_BUILD
+++ b/printer/ghostscript/PRE_BUILD
@@ -1,7 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
# remove most of the embedded libraries. use the system ones instead
-rm -rf freetype jpeg libpng tiff lcms2 cups ijs openjpeg zlib &&
+rm -rf freetype jpeg libpng tiff lcms2 ijs openjpeg zlib &&

patch -p1 < "$SPELL_DIRECTORY/fix_openjp2_dynamic_linking.patch" &&

diff --git a/video/mkvtoolnix/BUILD b/video/mkvtoolnix/BUILD
index 3ace354..73c4d58 100755
--- a/video/mkvtoolnix/BUILD
+++ b/video/mkvtoolnix/BUILD
@@ -1,10 +1,10 @@
-if [[ $(get_spell_provider $SPELL QT) == "qt4" ]]
-then
-# help configure to find needed QT4 binaries
-# if not exported, configure doesn't find them
- export MOC="${INSTALL_ROOT}/usr/bin/qt4/moc"
- export RCC="${INSTALL_ROOT}/usr/bin/qt4/rcc"
- export UIC="${INSTALL_ROOT}/usr/bin/qt4/uic"
+# This seems wrong. Don't we have a standard thing for qtbase-dependent
stuff?
+if is_depends_enabled $SPELL qtbase; then
+ . ${GRIMOIRE}/FUNCTIONS
+ export PKG_CONFIG_PATH=$QT5BASE/lib/pkgconfig:$PKG_CONFIG_PATH
+ OPTS="$OPTS --with-moc=$QT5BASE/bin/moc"
+ OPTS="$OPTS --with-uic=$QT5BASE/bin/uic"
+ OPTS="$OPTS --with-rcc=$QT5BASE/bin/rcc"
fi &&
default_build_configure &&
-./drake -j${MAKE_NJOBS}
+rake
diff --git a/video/mkvtoolnix/DEPENDS b/video/mkvtoolnix/DEPENDS
index 8e8fd42..bad336d 100755
--- a/video/mkvtoolnix/DEPENDS
+++ b/video/mkvtoolnix/DEPENDS
@@ -6,17 +6,20 @@ depends libmatroska &&
depends libogg &&
depends libvorbis &&
depends zlib &&
+depends libxslt &&
+depends po4a &&
+depends rake &&
+
sub_depends boost FILESYSTEM &&
sub_depends boost REGEX &&
sub_depends boost SYSTEM &&
+sub_depends boost DATE_TIME &&

-optional_depends QT --{en,dis}able-qt \
+optional_depends qtbase --{en,dis}able-qt \
"for Qt mkvinfo and mmg gui" &&
optional_depends flac --with{,out}-flac \
"for FLAC support" &&
optional_depends file --{en,dis}able-magic \
'for automatic content type detection' &&
optional_depends gettext --with{,out}-gettext \
- 'for gettext support' &&
-optional_depends curl --with{,out}-curl \
- 'for CURL support'
+ 'for gettext support'
diff --git a/video/mkvtoolnix/DETAILS b/video/mkvtoolnix/DETAILS
index cb05c63..58f81ad 100755
--- a/video/mkvtoolnix/DETAILS
+++ b/video/mkvtoolnix/DETAILS
@@ -1,10 +1,10 @@
SPELL=mkvtoolnix
- VERSION=9.4.0
+ VERSION=9.9.0
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://mkvtoolnix.download/sources/$SOURCE
WEB_SITE=http://www.bunkus.org/videotools/mkvtoolnix/
-
SOURCE_HASH=sha512:d4dc70ea048fdad5c4bb01d31ba8d8d8078332a07c8ce12e95f84d61e3e068334903723bd1b0029c04db65e180de445126f58aad28569330422e87cdbb0ba785
+
SOURCE_HASH=sha512:a00162abd75cf7d34ec14555da4fd80e114473e2a34323f9e1404c807e312ebdc516614643c02e5c22be0e3927e0c3f9ab7ad043d24dc5fd7176cf0719503484
LICENSE[0]=GPL
ENTERED=20030520
KEYWORDS="video"
diff --git a/video/mkvtoolnix/HISTORY b/video/mkvtoolnix/HISTORY
index dba7ffb..e1408fd 100644
--- a/video/mkvtoolnix/HISTORY
+++ b/video/mkvtoolnix/HISTORY
@@ -1,3 +1,7 @@
+2017-03-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 9.9.0
+ * DEPENDS, BUILD, INSTALL: updated accordingly
+
2016-08-29 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0]
updated spell to 9.4.0
diff --git a/video/mkvtoolnix/INSTALL b/video/mkvtoolnix/INSTALL
index a593c70..eb28b89 100755
--- a/video/mkvtoolnix/INSTALL
+++ b/video/mkvtoolnix/INSTALL
@@ -1 +1 @@
-./drake install
+rake install



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (4385db6d0c99d3c34b6983e2e9be67dc7aca0a95), Thomas Orgis, 04/07/2017

Archive powered by MHonArc 2.6.24.

Top of Page