Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (3e3eb78e5adbe49dbab2678d95cf9841effe0af9)

Chronological Thread  
    < 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 (3e3eb78e5adbe49dbab2678d95cf9841effe0af9)
  • Date: Sun, 20 Mar 2016 13:44:29 +0000
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

audio-libs/openal-soft/0001-fix-build-error-against-ffmpeg-3.patch
| 34 ++++++++++
audio-libs/openal-soft/DETAILS
| 4 -
audio-libs/openal-soft/HISTORY
| 5 +
audio-libs/openal-soft/PRE_BUILD
| 4 +
audio-players/moc/0001-use-channel_layout.h-instead-of-audioconvert.h.patch
| 25 +++++++
audio-players/moc/DETAILS
| 6 -
audio-players/moc/HISTORY
| 5 +
audio-players/moc/PRE_BUILD
| 1
graphics-libs/openimageio/BUILD
| 2
graphics-libs/openimageio/DETAILS
| 4 -
graphics-libs/openimageio/HISTORY
| 4 +
video-libs/x264/DETAILS
| 7 --
video-libs/x264/HISTORY
| 3
13 files changed, 93 insertions(+), 11 deletions(-)

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

audio-players/moc: version 2.5.0

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

audio-libs/openal-soft: version 1.17.2

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

graphics-libs/openimageio: version 1.6.11

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

video-libs/x264: version 20160319-2245

diff --git
a/audio-libs/openal-soft/0001-fix-build-error-against-ffmpeg-3.patch
b/audio-libs/openal-soft/0001-fix-build-error-against-ffmpeg-3.patch
new file mode 100644
index 0000000..a47bdd7
--- /dev/null
+++ b/audio-libs/openal-soft/0001-fix-build-error-against-ffmpeg-3.patch
@@ -0,0 +1,34 @@
+From 8a8ec571f453d586daf9e836be55699b77a706bd Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Sun, 20 Mar 2016 11:51:44 +0100
+Subject: [PATCH] fix build error against ffmpeg 3
+
+---
+ examples/alffplay.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/examples/alffplay.c b/examples/alffplay.c
+index ab67d21..a6ae725 100644
+--- a/examples/alffplay.c
++++ b/examples/alffplay.c
+@@ -942,7 +942,7 @@ static void update_picture(MovieState *movState, bool
*first_update, SDL_Window
+ void *pixels = NULL;
+ int pitch = 0;
+
+- if(movState->video.st->codec->pix_fmt == PIX_FMT_YUV420P)
++ if(movState->video.st->codec->pix_fmt == AV_PIX_FMT_YUV420P)
+ SDL_UpdateYUVTexture(vp->bmp, NULL,
+ frame->data[0], frame->linesize[0],
+ frame->data[1], frame->linesize[1],
+@@ -960,7 +960,7 @@ static void update_picture(MovieState *movState, bool
*first_update, SDL_Window
+ if(!movState->video.swscale_ctx)
+ movState->video.swscale_ctx = sws_getContext(
+ w, h, movState->video.st->codec->pix_fmt,
+- w, h, PIX_FMT_YUV420P, SWS_X, NULL, NULL, NULL
++ w, h, AV_PIX_FMT_YUV420P, SWS_X, NULL, NULL, NULL
+ );
+
+ /* point pict at the queue */
+--
+2.7.4
+
diff --git a/audio-libs/openal-soft/DETAILS b/audio-libs/openal-soft/DETAILS
index ca391a0..1c73de0 100755
--- a/audio-libs/openal-soft/DETAILS
+++ b/audio-libs/openal-soft/DETAILS
@@ -1,6 +1,6 @@
SPELL=openal-soft
- VERSION=1.17.1
-
SOURCE_HASH=sha512:f0b14e9fdcc22bb18d9c3278392fd94959cd3d85d83ad0472dcac24122fe1f8c818ef8c47197424f6d9789524d0aff64965ce502965f5d6541a772fc8dc3286d
+ VERSION=1.17.2
+
SOURCE_HASH=sha512:50c20cd3ddada55d91643a79c2894d5a14315d5fc1ed8e870e3d8d3f410e8b7d8da29b838226e7fce37fbeca719ff919b51806f72e4cd529a18fbe8bd68860e3
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://kcat.strangesoft.net/openal-releases/${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/audio-libs/openal-soft/HISTORY b/audio-libs/openal-soft/HISTORY
index 94510c8..8889432 100644
--- a/audio-libs/openal-soft/HISTORY
+++ b/audio-libs/openal-soft/HISTORY
@@ -1,3 +1,8 @@
+2016-03-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.17.2
+ * PRE_BUILD, 0001-fix-build-error-against-ffmpeg-3.patch: fix build
error
+ against ffmpeg 3
+
2015-12-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.17.1
* DEPENS: add alsa-lib,LIBAVCODEC, jack2, sdl2
diff --git a/audio-libs/openal-soft/PRE_BUILD
b/audio-libs/openal-soft/PRE_BUILD
new file mode 100755
index 0000000..f528c0e
--- /dev/null
+++ b/audio-libs/openal-soft/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+patch -p1 < "$SPELL_DIRECTORY/0001-fix-build-error-against-ffmpeg-3.patch"
diff --git
a/audio-players/moc/0001-use-channel_layout.h-instead-of-audioconvert.h.patch
b/audio-players/moc/0001-use-channel_layout.h-instead-of-audioconvert.h.patch
new file mode 100644
index 0000000..3f822a9
--- /dev/null
+++
b/audio-players/moc/0001-use-channel_layout.h-instead-of-audioconvert.h.patch
@@ -0,0 +1,25 @@
+From fff2e19c6afb85edfd74284aafdd4365014e848a Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.net>
+Date: Sun, 20 Mar 2016 12:23:42 +0100
+Subject: [PATCH] use channel_layout.h instead of audioconvert.h
+
+---
+ decoder_plugins/ffmpeg/ffmpeg.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/decoder_plugins/ffmpeg/ffmpeg.c
b/decoder_plugins/ffmpeg/ffmpeg.c
+index 206b2b1..66538db 100644
+--- a/decoder_plugins/ffmpeg/ffmpeg.c
++++ b/decoder_plugins/ffmpeg/ffmpeg.c
+@@ -67,7 +67,7 @@ GCC_DIAG_OFF(deprecated-declarations)
+ GCC_DIAG_ON(deprecated-declarations)
+ #include <libavutil/mathematics.h>
+ #ifdef HAVE_AV_GET_CHANNEL_LAYOUT_NB_CHANNELS
+-#include <libavutil/audioconvert.h>
++#include <libavutil/channel_layout.h>
+ #endif
+ #else
+ #include <ffmpeg/avformat.h>
+--
+2.7.4
+
diff --git a/audio-players/moc/DETAILS b/audio-players/moc/DETAILS
index 5a2b02b..33e79a6 100755
--- a/audio-players/moc/DETAILS
+++ b/audio-players/moc/DETAILS
@@ -8,10 +8,10 @@ if [[ "$MOC_BRANCH" == "scm" ]]; then
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
else
- VERSION=2.5.0-beta1
+ VERSION=2.5.0
SOURCE=${SPELL}-${VERSION}.tar.bz2
- SOURCE_URL[0]=ftp://ftp.daper.net/pub/soft/moc/unstable/${SOURCE}
-
SOURCE_HASH[0]=sha512:16f1cf35706bbf410197651fd4398114ae2c95103773886629f0e1884900f2b865b9b6354da507a57af021a7d6599cd2e1d7e338791dc4a6f55e6c6c193800f2
+ SOURCE_URL[0]=http://ftp.daper.net/pub/soft/moc/stable/${SOURCE}
+
SOURCE_HASH[0]=sha512:ca6cfd4d1d13030bd561df8ab671399a17dfb675c360ecc95a2491c6a85764d0f72259ac33665405b197f370f4fd7ef59d9a485706f8a882bff30d0fafcf252c
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION}
fi
WEB_SITE=http://moc.daper.net/
diff --git a/audio-players/moc/HISTORY b/audio-players/moc/HISTORY
index 9cdb086..bfe0a70 100644
--- a/audio-players/moc/HISTORY
+++ b/audio-players/moc/HISTORY
@@ -1,3 +1,8 @@
+2016-03-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.5.0
+ * PRE_BUILD,
0001-use-channel_layout.h-instead-of-audioconvert.h.patch:
+ fix build against ffmpeg 3
+
2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Use get_scm_version

diff --git a/audio-players/moc/PRE_BUILD b/audio-players/moc/PRE_BUILD
index 68264d1..00a09a1 100755
--- a/audio-players/moc/PRE_BUILD
+++ b/audio-players/moc/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
+patch -p1 <
"$SPELL_DIRECTORY/0001-use-channel_layout.h-instead-of-audioconvert.h.patch"
&&
autoreconf -fi
diff --git a/graphics-libs/openimageio/BUILD b/graphics-libs/openimageio/BUILD
index 84c710a..0ad795f 100755
--- a/graphics-libs/openimageio/BUILD
+++ b/graphics-libs/openimageio/BUILD
@@ -1,5 +1,7 @@
mkdir -p ${SOURCE_DIRECTORY}/build &&
cd ${SOURCE_DIRECTORY}/build &&
+CFLAGS="-Wno-error=deprecated-declarations $CFLAGS" &&
+CXXFLAGS="-Wno-error=deprecated-declarations $CXXFLAGS" &&
prepare_cmake_flags &&
cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr
-DSYSCONFDIR=$INSTALL_ROOT/etc $OPTS .. &&
default_build_make
diff --git a/graphics-libs/openimageio/DETAILS
b/graphics-libs/openimageio/DETAILS
index b55f9b1..e67e925 100755
--- a/graphics-libs/openimageio/DETAILS
+++ b/graphics-libs/openimageio/DETAILS
@@ -1,8 +1,8 @@
SPELL=openimageio
- VERSION=1.6.10
+ VERSION=1.6.11
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]="https://github.com/OpenImageIO/oiio/archive/Release-${VERSION}.tar.gz";
-
SOURCE_HASH=sha512:d77d92d28d7a7451df30a1b5661cb584afa03d089b449869cd3e9b77e6ef8b01d4dc9248561ecf3ede862c3118d16601f7018c27abac66da20e0e399aea4e1f5
+
SOURCE_HASH=sha512:f50c6487fbe24dbbfb66e454970001ca6f0521aa467bdd6cf2b55591a397029ec805166ad93081e0b1569099bc8e828fbe54d0f8774d5a9313942ca5cc2e86f0
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/oiio-Release-${VERSION}"
WEB_SITE="https://sites.google.com/site/openimageio/";
LICENSE[0]=BSD
diff --git a/graphics-libs/openimageio/HISTORY
b/graphics-libs/openimageio/HISTORY
index 3c60b38..9391e53 100644
--- a/graphics-libs/openimageio/HISTORY
+++ b/graphics-libs/openimageio/HISTORY
@@ -1,3 +1,7 @@
+2016-03-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.6.11
+ * BUILD: suppress deprecation errors
+
2016-02-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.6.10
* DEPENDS: add optional dependency on ptex
diff --git a/video-libs/x264/DETAILS b/video-libs/x264/DETAILS
index 9069254..9ff693d 100755
--- a/video-libs/x264/DETAILS
+++ b/video-libs/x264/DETAILS
@@ -1,10 +1,9 @@
SPELL=x264
- VERSION="$(date --date='1 day ago' +%Y%m%d)"-2245
-# VERSION=20160318-2245
+# VERSION="$(date --date='1 day ago' +%Y%m%d)"-2245
+ VERSION=20160319-2245
SOURCE=$SPELL-snapshot-$VERSION.tar.bz2
SOURCE_URL[0]=ftp://ftp.videolan.org/pub/videolan/x264/snapshots/$SOURCE
-#
SOURCE_HASH=sha512:0ec91bf34e89b0917acc805d649c4a33f67a4653b854640ca72364788f13c7c9c39941fe77e953cd36861b4fe640afec9a8f91b22c5ffeadfcabe4cfb72889b3
- SOURCE_IGNORE=volatile
+
SOURCE_HASH=sha512:497084ee36568cb6cf5e66580edc7be1cab98f535b362183ae682be47496dd8763c623f6a005065d8ae54ebd0cf37034873a79b4a24e167642d890d8efc19cf8
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-snapshot-$VERSION
WEB_SITE=http://developers.videolan.org/x264.html
LICENSE[0]=GPL
diff --git a/video-libs/x264/HISTORY b/video-libs/x264/HISTORY
index 253db77..014212f 100644
--- a/video-libs/x264/HISTORY
+++ b/video-libs/x264/HISTORY
@@ -1,3 +1,6 @@
+2016-03-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 20160319-2245
+
2016-03-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: since only snapshots are available, use yesterday's daily
tarball


  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (3e3eb78e5adbe49dbab2678d95cf9841effe0af9), Florian Franzmann, 03/20/2016

Archive powered by MHonArc 2.6.24.

Top of Page