Skip to Content.
Sympa Menu

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

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 (d479313a2e58cf7c76a00680f3d0f4d6d7f203b4)
  • Date: Sun, 6 Mar 2016 20:08:25 +0000

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

fonts-x11/noto-sans-latin/DETAILS | 4 -
fonts-x11/noto-sans-latin/HISTORY | 4 +
graphics/autotrace/HISTORY | 4 +
graphics/autotrace/PRE_BUILD | 3 -
graphics/autotrace/autotrace-0.31.1-libpng15.patch | 59
+++++++++++++++++++++
graphics/inkscape/BUILD | 2
graphics/inkscape/HISTORY | 4 +
video/avidemux3/DETAILS | 9 +--
video/avidemux3/HISTORY | 3 +
video/mplayer/DEPENDS | 13 ++--
video/mplayer/DETAILS | 12 ++--
video/mplayer/HISTORY | 5 +
12 files changed, 103 insertions(+), 19 deletions(-)

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

inkscape: build in C++11 mode

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

mplayer: version 1.2 (needed to build with current ffmpeg in grimoire)

commit 94990793d06b25ff9aa5d065a879cc5047557a3a
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

noto-sans-latin: update hash, also introduce a pseudo-version (good idea
or not?)

commit 3b2fd4189c6b110eff2c3d5193d87c1e9d3a983d
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

avidemux3: version 2.6.12

commit 2d68589f6536729e114143bbc3a7f55597ae4d34
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

autotrace: fix build with libpng-1.6

diff --git a/fonts-x11/noto-sans-latin/DETAILS
b/fonts-x11/noto-sans-latin/DETAILS
index a79e428..dbeb661 100755
--- a/fonts-x11/noto-sans-latin/DETAILS
+++ b/fonts-x11/noto-sans-latin/DETAILS
@@ -1,7 +1,7 @@
SPELL=noto-sans-latin
SPELLX=NotoSans-hinted
- VERSION=0
-
SOURCE_HASH=sha512:6d35cde1412f29ba5acbdb5446360f02b58864a661c59ad215c4e1dd39401e203cb110dbe381f99e9619a09bbce265a566fac4ad1973631efa0cc6230c90405b
+ VERSION=20160306
+
SOURCE_HASH=sha512:14062ada3e10893764860128f2d10c4edc4f8896226beaae1cdce52795c1b6d2adc8d7548db95a40f608b714ae9257ba42a7aab0c0e5c1486063f42fd3148bee
SOURCE=$SPELLX.zip
DOCS="README LICENSE AUTHORS NEWS BUGS *.txt"
SOURCE_URL[0]=https://noto-website-2.storage.googleapis.com/pkgs/$SOURCE
diff --git a/fonts-x11/noto-sans-latin/HISTORY
b/fonts-x11/noto-sans-latin/HISTORY
index 4e12483..19a95a1 100644
--- a/fonts-x11/noto-sans-latin/HISTORY
+++ b/fonts-x11/noto-sans-latin/HISTORY
@@ -1,2 +1,6 @@
+2016-03-06 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: Updated hash since they changed upstream ... introduced a
version
+ to indicate when I did this. A real version would be nice, though.
+
2015-10-19 Treeve Jelbert <treeve AT sourcemage.org>
* ALL: spell created.
diff --git a/graphics/autotrace/HISTORY b/graphics/autotrace/HISTORY
index 6f7d4a6..10518ff 100644
--- a/graphics/autotrace/HISTORY
+++ b/graphics/autotrace/HISTORY
@@ -1,3 +1,7 @@
+2016-03-06 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD,autotrace-0.31.1-libpng15.patch: patch for current libpng
from
+ Fedora
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/graphics/autotrace/PRE_BUILD b/graphics/autotrace/PRE_BUILD
index ab38698..9aae022 100755
--- a/graphics/autotrace/PRE_BUILD
+++ b/graphics/autotrace/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/bug140588-as-needed.patch
+patch -p1 < $SCRIPT_DIRECTORY/bug140588-as-needed.patch &&
+patch -p0 < $SCRIPT_DIRECTORY/autotrace-0.31.1-libpng15.patch
diff --git a/graphics/autotrace/autotrace-0.31.1-libpng15.patch
b/graphics/autotrace/autotrace-0.31.1-libpng15.patch
new file mode 100644
index 0000000..4154e04
--- /dev/null
+++ b/graphics/autotrace/autotrace-0.31.1-libpng15.patch
@@ -0,0 +1,59 @@
+Description: Fix for libpng 1.6
+ libpng1.6 hides some implementation details, getters/setters are now to be
used.
+Origin:
+http://pkgs.fedoraproject.org/cgit/rpms/autotrace.git/plain/autotrace-0.31.1-libpng15.patch?id=0fbea0205eddba3b39fcf17ac91984dd2aa5ab1e
+
+--- input-png.c.orig 2012-03-02 09:30:00.958350697 -0600
++++ input-png.c 2012-03-02 09:32:50.728927667 -0600
+@@ -42,7 +42,7 @@
+
+ static void handle_warning(png_structp png, const at_string message) {
+ LOG1("PNG warning: %s", message);
+- at_exception_warning((at_exception_type *)png->error_ptr,
++ at_exception_warning((at_exception_type *)png_get_error_ptr(png),
+ message);
+ /* at_exception_fatal((at_exception_type *)at_png->error_ptr,
+ "PNG warning"); */
+@@ -50,7 +50,7 @@
+
+ static void handle_error(png_structp png, const at_string message) {
+ LOG1("PNG error: %s", message);
+- at_exception_fatal((at_exception_type *)png->error_ptr,
++ at_exception_fatal((at_exception_type *)png_get_error_ptr(png),
+ message);
+ /* at_exception_fatal((at_exception_type *)at_png->error_ptr,
+ "PNG error"); */
+@@ -157,8 +157,8 @@
+
+ png_set_strip_16(png_ptr);
+ png_set_packing(png_ptr);
+- if ((png_ptr->bit_depth < 8) ||
+- (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ||
++ if ((png_get_bit_depth(png_ptr, info_ptr) < 8) ||
++ (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE)
||
+ (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)))
+ png_set_expand(png_ptr);
+
+@@ -181,20 +181,10 @@
+ PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
+ } else
+ png_set_strip_alpha(png_ptr);
++ png_set_interlace_handling(png_ptr);
+ png_read_update_info(png_ptr, info_ptr);
+
+-
+- info_ptr->row_pointers = (png_bytepp)png_malloc(png_ptr,
+- info_ptr->height *
sizeof(png_bytep));
+-#ifdef PNG_FREE_ME_SUPPORTED
+- info_ptr->free_me |= PNG_FREE_ROWS;
+-#endif
+- for (row = 0; row < (int)info_ptr->height; row++)
+- info_ptr->row_pointers[row] = (png_bytep)png_malloc(png_ptr,
+-
png_get_rowbytes(png_ptr, info_ptr));
+-
+- png_read_image(png_ptr, info_ptr->row_pointers);
+- info_ptr->valid |= PNG_INFO_IDAT;
++ png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL);
+ png_read_end(png_ptr, info_ptr);
+ return png_get_rows(png_ptr, info_ptr);
+ }
diff --git a/graphics/inkscape/BUILD b/graphics/inkscape/BUILD
new file mode 100755
index 0000000..9efa61f
--- /dev/null
+++ b/graphics/inkscape/BUILD
@@ -0,0 +1,2 @@
+# Dependency hell demands C++11.
+CXXFLAGS+=" -std=gnu++11" default_build
diff --git a/graphics/inkscape/HISTORY b/graphics/inkscape/HISTORY
index 0f9f04e..984c431 100644
--- a/graphics/inkscape/HISTORY
+++ b/graphics/inkscape/HISTORY
@@ -1,3 +1,7 @@
+2016-03-06 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: added, to enable C++11 mode to make it build again with
+ those funky dependencies
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/video/avidemux3/DETAILS b/video/avidemux3/DETAILS
index f5cc496..f27a760 100755
--- a/video/avidemux3/DETAILS
+++ b/video/avidemux3/DETAILS
@@ -1,12 +1,11 @@
SPELL=avidemux3
- VERSION=2.6.10
+ VERSION=2.6.12
SOURCE=${SPELL%3}_$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL%3}_$VERSION"
- SOURCE_URL[0]=http://download.berlios.de/${SPELL%3}/$SOURCE
- SOURCE_URL[1]=http://download2.berlios.de/${SPELL%3}/$SOURCE
-
SOURCE_URL[2]=http://downloads.sourceforge.net/sourceforge/${SPELL%3}/$SOURCE
+# There's fosshub, too, but that is unfriendly to wget(?).
+
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELL%3}/$SOURCE
WEB_SITE=http://fixounet.free.fr/avidemux/
-
SOURCE_HASH=sha512:f9414810925b2eeb0b6dc0094ac9a42809ab11274d2cd591eef753538d5719df893dc2352b85c8a1047b890bb03079678e6619af9bb25834a2428cfdae5005ef
+
SOURCE_HASH=sha512:ca5a03eae6bb583d20499da68400645cc7b66c27255fc77f18ffe311d3d27eaaf3ca813aff25a54934d76fe5d10d9fb48b2ad30d662377764f3ec1b620d5a824
LICENSE[0]=GPL
ENTERED=20140319
KEYWORDS="video"
diff --git a/video/avidemux3/HISTORY b/video/avidemux3/HISTORY
index 969a5c6..b2c6efc 100644
--- a/video/avidemux3/HISTORY
+++ b/video/avidemux3/HISTORY
@@ -1,3 +1,6 @@
+2016-03-06 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 2.6.12
+
2016-03-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.6.10
* DEPENDS: add optional dependency on x265
diff --git a/video/mplayer/DEPENDS b/video/mplayer/DEPENDS
index aa9f2f8..906f2f6 100755
--- a/video/mplayer/DEPENDS
+++ b/video/mplayer/DEPENDS
@@ -20,11 +20,14 @@ else
optional_depends libdvdnav "" "--disable-dvdnav" "support for DVD
navigation"
fi &&

-optional_depends libvorbis "--disable-tremor-internal
--extra-libs=-lvorbisenc" "" "to use external libvorbis to play ogg/vorbis
audio" &&
-
-if is_depends_enabled $SPELL libvorbis; then
- depends libogg
-fi &&
+# The vorbis stuff just does not work ... probably specification
+# of -lvorbisenc and -lvorbis needed ... spaces in OPTS ...
+# Try to let configure work it out itself.
+#optional_depends libvorbis "--enable-libvorbis" "--disable-libvorbis" "to
use external libvorbis to play ogg/vorbis audio" &&
+
+#if is_depends_enabled $SPELL libvorbis; then
+# depends libogg
+#fi &&

optional_depends faad2 "--enable-faad" "" "to use shared faad for AAC
decoding" &&

diff --git a/video/mplayer/DETAILS b/video/mplayer/DETAILS
index 1db1594..5e2b304 100755
--- a/video/mplayer/DETAILS
+++ b/video/mplayer/DETAILS
@@ -8,16 +8,16 @@ if [[ $MPLAYER_BRANCH == scm ]]; then
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
else
- VERSION=1.1.1
+ VERSION=1.2.1
SOURCE=MPlayer-$VERSION.tar.xz
- SOURCE2=$SOURCE.asc
+# SOURCE2=$SOURCE.asc
SOURCE_URL[0]=ftp://ftp1.mplayerhq.hu/MPlayer/releases/$SOURCE
SOURCE_URL[1]=ftp://ftp2.mplayerhq.hu/MPlayer/releases/$SOURCE
SOURCE_URL[2]=ftp://ftp5.mplayerhq.hu/MPlayer/releases/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE2_URL[2]=${SOURCE_URL[2]}.asc
- SOURCE_GPG=mplayer.gpg:$SOURCE2:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
+# SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+# SOURCE2_URL[2]=${SOURCE_URL[2]}.asc
+ SOURCE_HASH=sha1:cf988d8c7fe7bcf15a48970f0cf9e46837d78e1b:UPSTREAM_HASH
+# SOURCE2_IGNORE=signature
SOURCE_DIRECTORY=$BUILD_DIRECTORY/MPlayer-$VERSION
SECURITY_PATCH=4
fi
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index bb0f385..ffe91dc 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,8 @@
+2016-02-28 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: update to 1.2.1 (matching our ffmpeg 2.8.x)
+ Cannot find upstream signature anymore, using hash instead.
+ * DEPENDS: giving up about vorbis configure args
+
2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: MESALIB => mesalib




  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d479313a2e58cf7c76a00680f3d0f4d6d7f203b4), Thomas Orgis, 03/06/2016

Archive powered by MHonArc 2.6.24.

Top of Page