Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

 dev/null                               |binary
 net/minidlna/DETAILS                   |    2 -
 net/minidlna/HISTORY                   |    3 ++
 net/minidlna/minidlna-1.1.5.tar.gz.sig |binary
 video-libs/libvpx/HISTORY              |    4 +++
 video-libs/libvpx/UP_TRIGGERS          |   15 +++++++++++
 video/ffmpeg/DETAILS                   |    2 -
 video/ffmpeg/HISTORY                   |    5 +++
 video/ffmpeg/PRE_BUILD                 |    7 ++++-
 video/ffmpeg/libvpx-1.5.patch          |   42 
+++++++++++++++++++++++++++++++++
 10 files changed, 77 insertions(+), 3 deletions(-)

New commits:
commit 26f40fe82ac2b51b7b10798f23bb86efdda1a089
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    minidlna: Updated to 1.1.5

commit bf2fcfccd82dec2e7654eb88ce6b2af9ba3e0219
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    libvpx: Add UP_TRIGGERS, as 1.4 -> 1.5 changed the ABI
    
    libvpx.so.2 -> libvpx.so.3 (breaks ffmpeg and others)

commit bb3195c0ea92a9bc7c90ffc566d384dff5939699
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    ffmpeg: Updated to 2.8.2 and fix for libvpx 1.5
    
    libvpx-1.5.patch from https://trac.ffmpeg.org/ticket/5007 to work with
    libvpx 1.5.0.
    
    Fixes breakage from 5e8b4efd2f58688ea59851688d0efd14738906c9

diff --git a/net/minidlna/DETAILS b/net/minidlna/DETAILS
index d445a0d..b869434 100755
--- a/net/minidlna/DETAILS
+++ b/net/minidlna/DETAILS
@@ -1,5 +1,5 @@
            SPELL=minidlna
-         VERSION=1.1.4
+         VERSION=1.1.5
           SOURCE="${SPELL}-${VERSION}.tar.gz"
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
 #     
SOURCE_HASH=sha512:e8be77777f147f95b308d9b10d40f239e3031da1b5b074fd3bff8bb11e0234ca4eaf1a942527755cbc83f97c8dd0a768c284fd63601b3ca05f2bd5db6eb02e49
diff --git a/net/minidlna/HISTORY b/net/minidlna/HISTORY
index fa38d3d..c6cd986 100644
--- a/net/minidlna/HISTORY
+++ b/net/minidlna/HISTORY
@@ -1,3 +1,6 @@
+2015-11-17 Eric Sandall <sandalle AT sourcemage.org>
+       * DETAILS: Updated to 1.1.5
+
 2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
        * DETAILS: remove SOURCEFORGE_URL usage (automated)
 
diff --git a/net/minidlna/minidlna-1.1.4.tar.gz.sig 
b/net/minidlna/minidlna-1.1.4.tar.gz.sig
deleted file mode 100644
index fae70f4..0000000
Binary files a/net/minidlna/minidlna-1.1.4.tar.gz.sig and /dev/null differ
diff --git a/net/minidlna/minidlna-1.1.5.tar.gz.sig 
b/net/minidlna/minidlna-1.1.5.tar.gz.sig
new file mode 100644
index 0000000..d68fd21
Binary files /dev/null and b/net/minidlna/minidlna-1.1.5.tar.gz.sig differ
diff --git a/video-libs/libvpx/HISTORY b/video-libs/libvpx/HISTORY
index 0dbc5a6..1fdde5e 100644
--- a/video-libs/libvpx/HISTORY
+++ b/video-libs/libvpx/HISTORY
@@ -1,3 +1,7 @@
+2015-11-17 Eric Sandall <sandalle AT sourcemage.org>
+       * UP_TRIGGERS: Add, as 1.4 -> 1.5 changed the ABI
+         libvpx.so.2 -> libvpx.so.3 (breaks ffmpeg and others)
+
 2015-11-11 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.5.0
 
diff --git a/video-libs/libvpx/UP_TRIGGERS b/video-libs/libvpx/UP_TRIGGERS
new file mode 100755
index 0000000..eebdc16
--- /dev/null
+++ b/video-libs/libvpx/UP_TRIGGERS
@@ -0,0 +1,15 @@
+if spell_ok $SPELL; then
+  local OLD_SPELL_VERSION="" &&
+  OLD_SPELL_VERSION="$(installed_version ${SPELL})" &&
+
+  if [[ "${OLD_SPELL_VERSION}" != "${VERSION}" ]]; then
+    message "${MESSAGE_COLOR}This is a possibly incompatible update of 
${SPELL_COLOR}${SPELL}${NO_COLOR}${MESSAGE_COLOR}...${DEFAULT_COLOR}"
+    message "${MESSAGE_COLOR}Figuring out what spells need to be checked, 
this may take a while.${DEFAULT_COLOR}"
+    for each in $(show_up_depends $SPELL); do
+      if gaze install $each | xargs readelf -d 2> /dev/null |
+         grep -q "NEEDED.*libvpx\.so"; then
+           up_trigger $each check_self
+      fi
+    done
+  fi
+fi
diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index b8cf4c2..777f9e0 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,6 +1,6 @@
            SPELL=ffmpeg
 if [[ $FFMPEG_RELEASE == stable ]]; then
-         VERSION=2.8.1
+         VERSION=2.8.2
   SECURITY_PATCH=15
 else
          VERSION=0.7.16
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index 37d337c..e5455e2 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,8 @@
+2015-11-17 Eric Sandall <sandalle AT sourcemage.org>
+       * DETAILS: Updated to 2.8.2
+       * PRE_BUILD: Apply patch to work with libvpx 1.5
+       * libvpx-1.5.patch: From https://trac.ffmpeg.org/ticket/5007
+
 2015-10-14 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.8.1
 
diff --git a/video/ffmpeg/PRE_BUILD b/video/ffmpeg/PRE_BUILD
index db36624..8de7bc9 100755
--- a/video/ffmpeg/PRE_BUILD
+++ b/video/ffmpeg/PRE_BUILD
@@ -10,4 +10,9 @@ sed -i \
 -e '/^pkg.*{/,/^}/ 
s|\$libdir|\$\{prefix\}/lib|;s|\$incdir|\$\{prefix\}/include|'\
    configure &&
 #s|\\\$|\$|;
-sedit  '/#define LIBAVCODEC_VERSION_INT/i#if !defined INT64_C\n#if defined 
__WORDSIZE && __WORDSIZE == 64\n#define INT64_C(c) c ## L\n#else\n#define 
INT64_C(c) c ## LL\n#endif\n#endif'  libavcodec/avcodec.h
+sedit  '/#define LIBAVCODEC_VERSION_INT/i#if !defined INT64_C\n#if defined 
__WORDSIZE && __WORDSIZE == 64\n#define INT64_C(c) c ## L\n#else\n#define 
INT64_C(c) c ## LL\n#endif\n#endif'  libavcodec/avcodec.h  &&
+
+
+message "${MESSAGE_COLOR}Apply fix for libvpx 1.5 API...${DEFAULT_COLOR}"  &&
+patch "${SOURCE_DIRECTORY}"/libavcodec/libvpxenc.c  \
+      "${SPELL_DIRECTORY}"/libvpx-1.5.patch
diff --git a/video/ffmpeg/libvpx-1.5.patch b/video/ffmpeg/libvpx-1.5.patch
new file mode 100644
index 0000000..e8c2128
--- /dev/null
+++ b/video/ffmpeg/libvpx-1.5.patch
@@ -0,0 +1,42 @@
+From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001
+From: James Zern <jzern AT google.com>
+Date: Mon, 19 Oct 2015 22:44:11 -0700
+Subject: [PATCH] libvpxenc: remove some unused ctrl id mappings
+
+VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed
+from libvpx and the remaining values were never used here
+
+Reviewed-by: Michael Niedermayer <michael AT niedermayer.cc>
+Signed-off-by: James Zern <jzern AT google.com>
+---
+ libavcodec/libvpxenc.c |    8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
+index 5f39783..992122c 100644
+--- a/libavcodec/libvpxenc.c
++++ b/libavcodec/libvpxenc.c
+@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext {
+ 
+ /** String mappings for enum vp8e_enc_control_id */
+ static const char *const ctlidstr[] = {
+-    [VP8E_UPD_ENTROPY]           = "VP8E_UPD_ENTROPY",
+-    [VP8E_UPD_REFERENCE]         = "VP8E_UPD_REFERENCE",
+-    [VP8E_USE_REFERENCE]         = "VP8E_USE_REFERENCE",
+-    [VP8E_SET_ROI_MAP]           = "VP8E_SET_ROI_MAP",
+-    [VP8E_SET_ACTIVEMAP]         = "VP8E_SET_ACTIVEMAP",
+-    [VP8E_SET_SCALEMODE]         = "VP8E_SET_SCALEMODE",
+     [VP8E_SET_CPUUSED]           = "VP8E_SET_CPUUSED",
+     [VP8E_SET_ENABLEAUTOALTREF]  = "VP8E_SET_ENABLEAUTOALTREF",
+     [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
+-    [VP8E_SET_SHARPNESS]         = "VP8E_SET_SHARPNESS",
+     [VP8E_SET_STATIC_THRESHOLD]  = "VP8E_SET_STATIC_THRESHOLD",
+     [VP8E_SET_TOKEN_PARTITIONS]  = "VP8E_SET_TOKEN_PARTITIONS",
+-    [VP8E_GET_LAST_QUANTIZER]    = "VP8E_GET_LAST_QUANTIZER",
+     [VP8E_SET_ARNR_MAXFRAMES]    = "VP8E_SET_ARNR_MAXFRAMES",
+     [VP8E_SET_ARNR_STRENGTH]     = "VP8E_SET_ARNR_STRENGTH",
+     [VP8E_SET_ARNR_TYPE]         = "VP8E_SET_ARNR_TYPE",
+-- 
+1.7.10.4
+
+