Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (76d9f04411179cf2c43131e4a7a26cac1d150766)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (76d9f04411179cf2c43131e4a7a26cac1d150766)
  • Date: Sun, 11 Sep 2016 12:21:50 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

fonts-x11/noto-sans-latin/DETAILS | 4 ++--
fonts-x11/noto-sans-latin/HISTORY | 3 +++
graphics-libs/gtkimageview/DETAILS | 6 +++---
graphics-libs/gtkimageview/HISTORY | 3 +++
graphics/imagemagick/DETAILS | 4 ++--
graphics/imagemagick/HISTORY | 3 +++
graphics/pngquant/DETAILS | 6 +++---
graphics/pngquant/HISTORY | 4 ++++
graphics/pngquant/INSTALL | 3 ++-
graphics/ufraw/DETAILS | 4 ++--
graphics/ufraw/HISTORY | 3 +++
kde4-support/libdbusmenu-qt/DETAILS | 10 ++++------
kde4-support/libdbusmenu-qt/HISTORY | 7 +++++--
libs/openscenegraph/DETAILS | 9 ++++-----
libs/openscenegraph/HISTORY | 3 +++
python-pypi/pillow/DETAILS | 6 +++---
python-pypi/pillow/HISTORY | 3 +++
qt5-cmake/libdbusmenu-qt5/DETAILS | 10 ++++------
qt5-cmake/libdbusmenu-qt5/HISTORY | 3 +++
video/ffmpeg/DETAILS | 2 +-
video/ffmpeg/HISTORY | 4 ++++
video/ffmpeg/PRE_BUILD | 2 ++
video/ffmpeg/ffmpeg_opj2.patch | 36
++++++++++++++++++++++++++++++++++++
23 files changed, 102 insertions(+), 36 deletions(-)

New commits:
commit 76d9f04411179cf2c43131e4a7a26cac1d150766
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/openscenegraph: version 3.4

commit 09cc1e2434c326890a5d2f74101961380158047c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video/ffmpeg: version 3.1.3

commit cfe0c86fcf874808cbb868b883406f35bbce8ff1
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics/ufraw: version 0.22

commit b3a63192485a7a8fe81ef9495a740a2eccaca7b8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

fonts-x11/noto-sans-latin: add version to source file

commit 549f9628682ceb23a1fbb6cdec88c9859acf309e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics-libs/gtkimageview: fix WEB_SITE, SOURCE_URL

commit 456c979f3d584c8548259ed4def6209fb40029d0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics/imagemagick: version 7.0.3-0

commit 3742ecbebec30c99f24dcd74277f9fb27f88dfca
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

qt5-cmake/libdbusmenu-qt5: fix misuse of PATCHLEVEL

commit 329552a06e4c94652cead49e733cdf42fe8399ae
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

kde4-support/libdbusmenu-qt: remove misuse of PATCHLEVEL

commit 68f0cc3b9f0fe647fbcbbdb37823ccc593a4e403
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

python-pypi/pillow: version 3.3.1

commit 47dd8c187b60338f0262e400cbef3f7d7e63f459
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics/pngquant: version 2.7.2

diff --git a/fonts-x11/noto-sans-latin/DETAILS
b/fonts-x11/noto-sans-latin/DETAILS
index dbeb661..0a3d4c5 100755
--- a/fonts-x11/noto-sans-latin/DETAILS
+++ b/fonts-x11/noto-sans-latin/DETAILS
@@ -2,9 +2,9 @@
SPELLX=NotoSans-hinted
VERSION=20160306

SOURCE_HASH=sha512:14062ada3e10893764860128f2d10c4edc4f8896226beaae1cdce52795c1b6d2adc8d7548db95a40f608b714ae9257ba42a7aab0c0e5c1486063f42fd3148bee
- SOURCE=$SPELLX.zip
+ SOURCE=$SPELLX-$VERSION.zip
DOCS="README LICENSE AUTHORS NEWS BUGS *.txt"
- SOURCE_URL[0]=https://noto-website-2.storage.googleapis.com/pkgs/$SOURCE
+
SOURCE_URL[0]=https://noto-website-2.storage.googleapis.com/pkgs/$SPELLX.zip
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
WEB_SITE=https://www.google.com/get/noto
LICENSE[0]="OFL"
diff --git a/fonts-x11/noto-sans-latin/HISTORY
b/fonts-x11/noto-sans-latin/HISTORY
index 19a95a1..ba97ec5 100644
--- a/fonts-x11/noto-sans-latin/HISTORY
+++ b/fonts-x11/noto-sans-latin/HISTORY
@@ -1,3 +1,6 @@
+2016-09-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: add version to source file
+
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.
diff --git a/graphics-libs/gtkimageview/DETAILS
b/graphics-libs/gtkimageview/DETAILS
index 1847690..b433510 100755
--- a/graphics-libs/gtkimageview/DETAILS
+++ b/graphics-libs/gtkimageview/DETAILS
@@ -1,10 +1,10 @@
SPELL=gtkimageview
VERSION=1.6.4
- SOURCE="${SPELL}-${VERSION}.tar.gz?format=raw"
-
SOURCE_URL[0]=http://trac.bjourne.webfactional.com/attachment/wiki/WikiStart/${SOURCE}
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=https://distfiles.macports.org/gtkimageview/$SOURCE

SOURCE_HASH=sha512:6378c640006e73aa1ffbf92eb9d4e42570707bc159f0a657b11f027d328088f5e89fc334de170de5ab1a39bed588b0b76f4633688a894cb7def16f1dea9f8e39
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
-
WEB_SITE="http://trac.bjourne.webfactional.com/chrome/common/gtkimageview-docs";
+ WEB_SITE="https://github.com/GNOME/gtkimageview";
LICENSE[0]=GPL
ENTERED=20090817
SHORT="a simple and fast image viewer widget for GTK+"
diff --git a/graphics-libs/gtkimageview/HISTORY
b/graphics-libs/gtkimageview/HISTORY
index 73e6fa9..f064f76 100644
--- a/graphics-libs/gtkimageview/HISTORY
+++ b/graphics-libs/gtkimageview/HISTORY
@@ -1,3 +1,6 @@
+2016-09-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix WEB_SITE, SOURCE_URL
+
2010-03-02 Vasil Yonkov <spirtbrat AT sourcemage.org>
* BUILD: removed
* DEPENDS: made gtk-doc optional
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index b740257..ef77a54 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,11 +1,11 @@
SPELL=imagemagick
SPELLX=ImageMagick
- VERSION=7.0.2-6
+ VERSION=7.0.3-0
SECURITY_PATCH=3
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
SOURCE_URL[0]=http://www.imagemagick.org/download/$SOURCE
-
SOURCE_HASH=sha512:415db62229e0b625f93cd18095b8a8309f70f57f42cf41efd46133329baad3f3e5357509148276485db4ed42c63408c45c159004bb6b9f8e2e35a5675e3beff1
+
SOURCE_HASH=sha512:ab0b99d3f656c68f32336561b0679792c876ff81eb172cc0ac48dd5217960d2aef4d01281517ec94548cf1783f3fd9b7618d9909fe00945ce4b95afd182c0aa3
CCACHE="off"
WEB_SITE=http://www.imagemagick.org/
ENTERED=20010922
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index 0e89c74..d2b4be2 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2016-09-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 7.0.3-0
+
2016-08-01 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS: version 7.0.2-6

diff --git a/graphics/pngquant/DETAILS b/graphics/pngquant/DETAILS
index f7965ad..197373e 100755
--- a/graphics/pngquant/DETAILS
+++ b/graphics/pngquant/DETAILS
@@ -1,8 +1,8 @@
SPELL=pngquant
- VERSION=2.7.1
+ VERSION=2.7.2
SOURCE=$SPELL-$VERSION-src.tar.gz
- SOURCE_URL[0]=https://github.com/pornel/pngquant/archive/${VERSION}.tar.gz
-
SOURCE_HASH=sha512:2f7ee843229a4a1a57447d5ece3c8c1309b589daa973d0a11a5c17e40cb18ae55125af81ef6ddfab13bbe5ba7efe4abed120ae38f920557fe5a9b7394092cc03
+ SOURCE_URL[0]=http://pngquant.org/${SOURCE}
+
SOURCE_HASH=sha512:ab84651cf0b5f3af2095b5741e0d03f4ddedbed59e75c5c75faeac20efa8dd2fb482f2a8d9447b5673e9ae6970b9af8dfdbe40062bdf377206ee87eaa69ed9d8
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://pngquant.org/
ENTERED=20130201
diff --git a/graphics/pngquant/HISTORY b/graphics/pngquant/HISTORY
index 188e0aa..dc46bed 100644
--- a/graphics/pngquant/HISTORY
+++ b/graphics/pngquant/HISTORY
@@ -1,3 +1,7 @@
+2016-09-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.7.2
+ * INSTALL: install header for library
+
2016-08-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.7.1
* BUILD, INSTALL: install library
diff --git a/graphics/pngquant/INSTALL b/graphics/pngquant/INSTALL
index 2c26599..bee56a5 100755
--- a/graphics/pngquant/INSTALL
+++ b/graphics/pngquant/INSTALL
@@ -4,4 +4,5 @@ make PREFIX="$INSTALL_ROOT/usr" install &&
install -vm 644 pngquant.1 "$INSTALL_ROOT/usr/share/man/man1" &&

cd lib &&
-install -vm 644 libimagequant.so libimagequant.so.0 "$INSTALL_ROOT/usr/lib"
+install -vm 644 libimagequant.so libimagequant.so.0 "$INSTALL_ROOT/usr/lib"
&&
+install -vm 644 libimagequant.h "$INSTALL_ROOT/usr/include"
diff --git a/graphics/ufraw/DETAILS b/graphics/ufraw/DETAILS
index 57bb9c4..62b216e 100755
--- a/graphics/ufraw/DETAILS
+++ b/graphics/ufraw/DETAILS
@@ -11,10 +11,10 @@ if [[ "$UFRAW_CVS" == "y" ]]; then
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-sfcvs
else
- VERSION=0.19.2
+ VERSION=0.22
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL/$SPELL/$SPELL-$VERSION/$SOURCE
-
SOURCE_HASH=sha512:fb104d51253b9db9242539fa63a184b1f3d30dd87ee173a061a8179ecb2b5db052569baf0d50ebb25b34f3930a3b2edf3e0061ca22ccbda510fe65672a4319b2
+
SOURCE_HASH=sha512:a42eff5052c18afec90245cf97ceeade78e3f288186cf697ac4abf2e8290d4081db8ac4de3ae47b3774f30a6cb4cbda392099e6fd2125fe751abb40d9b065ad2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
fi
WEB_SITE=http://ufraw.sourceforge.net/
diff --git a/graphics/ufraw/HISTORY b/graphics/ufraw/HISTORY
index b335ab7..696aa09 100644
--- a/graphics/ufraw/HISTORY
+++ b/graphics/ufraw/HISTORY
@@ -1,3 +1,6 @@
+2016-09-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.22
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/kde4-support/libdbusmenu-qt/DETAILS
b/kde4-support/libdbusmenu-qt/DETAILS
index 77ee255..dc8638d 100755
--- a/kde4-support/libdbusmenu-qt/DETAILS
+++ b/kde4-support/libdbusmenu-qt/DETAILS
@@ -1,12 +1,10 @@
SPELL=libdbusmenu-qt
- VERSION=0.9.3
- PATCHLEVEL=14.04.20140314
+ VERSION=0.9.3+14.04.20140314

SOURCE_HASH=sha512:028ef2d7d7845050e4deea10d71a77fd22a21d3504df28fcd29eec193990592d2fbe716d8839d425a567facd0eca6cbad9117542e8ad774f8b541833606aea24
- VX=${VERSION}+${PATCHLEVEL}
- SOURCE=${SPELL}_${VX}.orig.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VX
+ SOURCE=${SPELL}_${VERSION}.orig.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://launchpad.net/libdbusmenu-qt
-
SOURCE_URL="https://launchpad.net/ubuntu/trusty/+source/$SPELL/$VX-0ubuntu1/+files/$SOURCE";
+
SOURCE_URL="https://launchpad.net/ubuntu/trusty/+source/$SPELL/$VERSION-0ubuntu1/+files/$SOURCE";
SOURCE_HINTS="no-check-certificate"
LICENSE[0]=MIT
ENTERED=2010-04-26
diff --git a/kde4-support/libdbusmenu-qt/HISTORY
b/kde4-support/libdbusmenu-qt/HISTORY
index ef11b82..452df89 100644
--- a/kde4-support/libdbusmenu-qt/HISTORY
+++ b/kde4-support/libdbusmenu-qt/HISTORY
@@ -1,6 +1,9 @@
+2016-09-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: remove misuse of PATCHLEVEL
+
2014-03-18 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.9.3
- specify no-check-certificates
+ * DETAILS: version 0.9.3
+ specify no-check-certificates

2014-02-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: PATCHLEVEL +++
diff --git a/libs/openscenegraph/DETAILS b/libs/openscenegraph/DETAILS
index 61ee35f..7a2a3df 100755
--- a/libs/openscenegraph/DETAILS
+++ b/libs/openscenegraph/DETAILS
@@ -1,10 +1,9 @@
SPELL=openscenegraph
- VERSION=3.2.2-rc1
- BRANCH=${VERSION/%.?/}
+ VERSION=3.4
SOURCE=OpenSceneGraph-$VERSION.zip
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/OpenSceneGraph-${VERSION}
-
SOURCE_URL[0]=http://www.openscenegraph.org/downloads/developer_releases/$SOURCE
-
SOURCE_HASH=sha512:4f5369c1e3f69a68729aa282c838334c840936d1207ca128ed7bf66cec82ef8f8e6b44766c155b88266c55dff2d72ec4b0484646a94be845462afa4a5a99cd8a
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/OpenSceneGraph-OpenSceneGraph-${VERSION}
+
SOURCE_URL[0]=https://github.com/openscenegraph/OpenSceneGraph/archive/${SOURCE}
+
SOURCE_HASH=sha512:50b983ffec0fd5f3900debed109c753b8027b2e335d426bce1782cde60f4d7458485992eb10b7fe380afec71707042a63317f824e2f75e1914ff8952d6934c84
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
WEB_SITE=http://www.openscenegraph.org/
ENTERED=20021102
diff --git a/libs/openscenegraph/HISTORY b/libs/openscenegraph/HISTORY
index d739b38..e8b64dc 100644
--- a/libs/openscenegraph/HISTORY
+++ b/libs/openscenegraph/HISTORY
@@ -1,3 +1,6 @@
+2016-09-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 4.3
+
2015-07-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.2.2-rc1
* PRE_BUILD, gdal-2.patch: fix compile error with gdal 2
diff --git a/python-pypi/pillow/DETAILS b/python-pypi/pillow/DETAILS
index 07fca09..6ff7481 100755
--- a/python-pypi/pillow/DETAILS
+++ b/python-pypi/pillow/DETAILS
@@ -1,9 +1,9 @@
SPELL=pillow
SPELLX=Pillow
- VERSION=3.3.0
+ VERSION=3.3.1
SOURCE="${SPELLX}-${VERSION}.tar.gz"
-
SOURCE_URL[0]="https://pypi.python.org/packages/e0/27/f61098a12f14690689924de93ffdd101463083a80bf8ff3e0c218addf05b/${SOURCE}#md5=b5a15b03bf402fe254636c015fcf04da";
-
SOURCE_HASH=sha512:fc8b899f6663099b2cf365dcb28cc06f05b0fc074eb8c32c8d2a63ab796af3416331965feb5ca63d447f2b596bed2f61ddc66b846b40ebc140a637e75e304bf6
+
SOURCE_URL[0]="https://pypi.python.org/packages/7b/32/e6978aed8fba6398c00eec25f12798fb57647a6cef4f85db1567e3d086ef/${SOURCE}#md5=3bc85204223b52e96ed05c9441507eed";
+
SOURCE_HASH=sha512:cc43be2ce725c7443a04aacef98745d12ebfe7baaf8747028974f7042a6b53264acf3fdb7baed4f41b0ea1ede207dd584056341539d43b3c698b015146e85e7f
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
WEB_SITE="https://pypi.python.org/pypi/Pillow/";
LICENSE[0]=PIL
diff --git a/python-pypi/pillow/HISTORY b/python-pypi/pillow/HISTORY
index 8dcaa06..fab9c14 100644
--- a/python-pypi/pillow/HISTORY
+++ b/python-pypi/pillow/HISTORY
@@ -1,3 +1,6 @@
+2016-09-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.3.1
+
2016-08-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.3.0
* DEPENDS: add optional dependency on pngquant
diff --git a/qt5-cmake/libdbusmenu-qt5/DETAILS
b/qt5-cmake/libdbusmenu-qt5/DETAILS
index 2d21e29..7119863 100755
--- a/qt5-cmake/libdbusmenu-qt5/DETAILS
+++ b/qt5-cmake/libdbusmenu-qt5/DETAILS
@@ -1,13 +1,11 @@
SPELL=libdbusmenu-qt5
SPELLX=${SPELL//5}
- VERSION=0.9.3
- PATCHLEVEL=14.04.20140314
+ VERSION=0.9.3+14.04.20140314

SOURCE_HASH=sha512:028ef2d7d7845050e4deea10d71a77fd22a21d3504df28fcd29eec193990592d2fbe716d8839d425a567facd0eca6cbad9117542e8ad774f8b541833606aea24
- VX=${VERSION}+${PATCHLEVEL}
- SOURCE=${SPELLX}_${VX}.orig.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VX
+ SOURCE=${SPELLX}_${VERSION}.orig.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
WEB_SITE=https://launchpad.net/libdbusmenu-qt
-
SOURCE_URL="https://launchpad.net/ubuntu/trusty/+source/$SPELLX/$VX-0ubuntu1/+files/$SOURCE";
+
SOURCE_URL="https://launchpad.net/ubuntu/+archive/primary/+files/${SOURCE}";
SOURCE_HINTS="no-check-certificate"
LICENSE[0]=MIT
ENTERED=2010-04-26
diff --git a/qt5-cmake/libdbusmenu-qt5/HISTORY
b/qt5-cmake/libdbusmenu-qt5/HISTORY
index 254c5ab..fa6cc4a 100644
--- a/qt5-cmake/libdbusmenu-qt5/HISTORY
+++ b/qt5-cmake/libdbusmenu-qt5/HISTORY
@@ -1,3 +1,6 @@
+2016-09-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix misuse of PATCHLEVEL
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: depends -sub CXX gcc (half-automated)

diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index 0b85925..3b44bb0 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,6 +1,6 @@
SPELL=ffmpeg
if [[ $FFMPEG_RELEASE == stable ]]; then
- VERSION=3.0.2
+ VERSION=3.1.3
SECURITY_PATCH=16
else
VERSION=0.7.16
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index a214014..d26d19f 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,7 @@
+2016-09-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.1.3
+ * PRE_BUILD, ffmpeg_opj2.patch: fix linking error against openjpeg
2.1.1
+
2016-05-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.0.2

diff --git a/video/ffmpeg/PRE_BUILD b/video/ffmpeg/PRE_BUILD
index db36624..b0f74b9 100755
--- a/video/ffmpeg/PRE_BUILD
+++ b/video/ffmpeg/PRE_BUILD
@@ -3,6 +3,8 @@ cd $SOURCE_DIRECTORY &&

if [[ $FFMPEG_RELEASE == legacy ]]; then
patch -p0 < "$SPELL_DIRECTORY/freetype.patch"
+else
+ patch -p1 < "$SPELL_DIRECTORY/ffmpeg_opj2.patch"
fi &&

#fix bad pkg-config files
diff --git a/video/ffmpeg/ffmpeg_opj2.patch b/video/ffmpeg/ffmpeg_opj2.patch
new file mode 100644
index 0000000..11e66b4
--- /dev/null
+++ b/video/ffmpeg/ffmpeg_opj2.patch
@@ -0,0 +1,36 @@
+diff -rupN ffmpeg-3.1.1/configure ffmpeg-3.1.1-new/configure
+--- ffmpeg-3.1.1/configure 2016-06-27 01:54:28.000000000 +0200
++++ ffmpeg-3.1.1-new/configure 2016-07-27 22:25:36.585141648 +0200
+@@ -5669,7 +5669,7 @@ enabled libopencv && { check_hea
+ require opencv opencv2/core/core_c.h
cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
+ require_pkg_config opencv opencv/cxcore.h
cvCreateImageHeader; }
+ enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h
WelsGetCodecVersion
+-enabled libopenjpeg && { check_lib openjpeg-2.1/openjpeg.h
opj_version -lopenjp2 -DOPJ_STATIC ||
++enabled libopenjpeg && { check_lib openjpeg-2.1/openjpeg.h
opj_version -lopenjp2 ||
+ check_lib openjpeg-2.0/openjpeg.h
opj_version -lopenjp2 -DOPJ_STATIC ||
+ check_lib openjpeg-1.5/openjpeg.h
opj_version -lopenjpeg -DOPJ_STATIC ||
+ check_lib openjpeg.h opj_version -lopenjpeg
-DOPJ_STATIC ||
+diff -rupN ffmpeg-3.1.1/libavcodec/libopenjpegdec.c
ffmpeg-3.1.1-new/libavcodec/libopenjpegdec.c
+--- ffmpeg-3.1.1/libavcodec/libopenjpegdec.c 2016-06-27 01:54:29.000000000
+0200
++++ ffmpeg-3.1.1-new/libavcodec/libopenjpegdec.c 2016-07-27
22:25:45.509327071 +0200
+@@ -24,8 +24,6 @@
+ * JPEG 2000 decoder using libopenjpeg
+ */
+
+-#define OPJ_STATIC
+-
+ #include "libavutil/common.h"
+ #include "libavutil/imgutils.h"
+ #include "libavutil/intreadwrite.h"
+diff -rupN ffmpeg-3.1.1/libavcodec/libopenjpegenc.c
ffmpeg-3.1.1-new/libavcodec/libopenjpegenc.c
+--- ffmpeg-3.1.1/libavcodec/libopenjpegenc.c 2016-06-27 01:54:29.000000000
+0200
++++ ffmpeg-3.1.1-new/libavcodec/libopenjpegenc.c 2016-07-27
22:25:40.298218807 +0200
+@@ -24,8 +24,6 @@
+ * JPEG 2000 encoder using libopenjpeg
+ */
+
+-#define OPJ_STATIC
+-
+ #include "libavutil/avassert.h"
+ #include "libavutil/common.h"
+ #include "libavutil/imgutils.h"



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (76d9f04411179cf2c43131e4a7a26cac1d150766), Florian Franzmann, 09/11/2016

Archive powered by MHonArc 2.6.24.

Top of Page