Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

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

 graphics-libs/openjpeg/DETAILS     |    4 ++--
 graphics-libs/openjpeg/HISTORY     |    5 -----
 graphics-libs/openjpeg/INSTALL     |    5 +++++
 graphics-libs/openjpeg/UP_TRIGGERS |    5 ++---
 video/ffmpeg/DETAILS               |    2 +-
 video/ffmpeg/HISTORY               |    5 +++++
 video/ffmpeg/PRE_BUILD             |    7 +------
 7 files changed, 16 insertions(+), 17 deletions(-)

New commits:
commit 76cf94254fc27542b247e9e2cfbc2f0c3047cecb
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    ffmpeg: Updated to 2.8.4
    
    libvpx-1.5.patch no longer needed

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

    Revert "openjpeg: => 2.1.0"
    
    This reverts commit d116a6a512a53e1852a6f105974f7588dd641068.
    
    This breaks ffmpeg 2.8.2 (and even the up-to-date 2.8.4).
    
    See https://trac.ffmpeg.org/ticket/2016, the fix doesn't appear to be in
    the stable branch yet.
    
    I spent an hour trying to fix ffmpeg to work with openjpeg 2.x, but at
    best I got the errors similar to https://trac.ffmpeg.org/ticket/3712
    (marked as a duplicate of #2016 above).
    
    Reverting this change allows ffmpeg 2.8.2 (and 2.8.4) to compile (and
    run).

diff --git a/graphics-libs/openjpeg/DETAILS b/graphics-libs/openjpeg/DETAILS
index c61d4ce..5092b32 100755
--- a/graphics-libs/openjpeg/DETAILS
+++ b/graphics-libs/openjpeg/DETAILS
@@ -1,6 +1,6 @@
            SPELL=openjpeg
-         VERSION=2.1.0
-     
SOURCE_HASH=sha512:3da84d7828a82c738f6ea5fe776c989283ba257cc6884aebfc090cee7e33c88471dee1a93f4a87a300b11f43b98f6624b838171f06227add24afcb1d57208df1
+         VERSION=1.5.2
+     
SOURCE_HASH=sha512:b945cf4f8b5e3227a0c07120c94b0ed5bf30c901de73059ee1d47975f46744fb62bbe84cdb2917c6431128f400020874eb07160af870b5448ced897998b08862
   SECURITY_PATCH=2
 #      SOURCE_GPG="gurus.gpg:$SOURCE.sig"
           SOURCE=${SPELL}-${VERSION}.tar.gz
diff --git a/graphics-libs/openjpeg/HISTORY b/graphics-libs/openjpeg/HISTORY
index a1501f6..b5e02db 100644
--- a/graphics-libs/openjpeg/HISTORY
+++ b/graphics-libs/openjpeg/HISTORY
@@ -1,8 +1,3 @@
-2015-12-17 Treeve Jelbert <treeve AT sourcemage.org>
-       * DETAILS: version 2.1.0
-       * INSTALL: deleted
-       * UP_TRIGGERS: updated
-
 2014-06-26 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.5.2
          SECURITY_PATCH++
diff --git a/graphics-libs/openjpeg/INSTALL b/graphics-libs/openjpeg/INSTALL
new file mode 100755
index 0000000..4a50fc6
--- /dev/null
+++ b/graphics-libs/openjpeg/INSTALL
@@ -0,0 +1,5 @@
+default_install &&
+
+rm $INSTALL_ROOT/usr/share/pkgconfig/libopenjpeg.pc &&
+cd $INSTALL_ROOT/usr/share/pkgconfig &&
+ln -s $INSTALL_ROOT/usr/lib/pkgconfig/libopenjpeg1.pc libopenjpeg.pc
diff --git a/graphics-libs/openjpeg/UP_TRIGGERS 
b/graphics-libs/openjpeg/UP_TRIGGERS
index 117aae1..fb874ce 100755
--- a/graphics-libs/openjpeg/UP_TRIGGERS
+++ b/graphics-libs/openjpeg/UP_TRIGGERS
@@ -1,18 +1,17 @@
 # up_trigger everything on updated to 1.5.1 as soname changed from 
libopenjpeg.so.1 to libopenjpeg.so.5
-# .so files now called libopenjp2.so
 
 . "$GRIMOIRE/FUNCTIONS" &&
 
 local OLD_SPELL_VERSION=""
 if spell_ok  $SPELL; then
   OLD_SPELL_VERSION="$(installed_version $SPELL)"
-  if is_version_less "${OLD_SPELL_VERSION}" "2.1.0"; then
+  if is_version_less "${OLD_SPELL_VERSION}" "1.5.1"; then
 
     message "This is a possibly incompatible update of $SPELL..."
     message "Figuring out what spells need to be recast, this may take a 
while."
     for each in $(show_up_depends $SPELL); do
       if gaze install $each | xargs readelf -d 2> /dev/null |
-         grep -q "NEEDED.*libopenjpeg\.so\.?"; then
+         grep -q "NEEDED.*libopenjpeg\.so\.1"; then
            up_trigger $each cast_self
       fi
     done
diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index 777f9e0..5298952 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,6 +1,6 @@
            SPELL=ffmpeg
 if [[ $FFMPEG_RELEASE == stable ]]; then
-         VERSION=2.8.2
+         VERSION=2.8.4
   SECURITY_PATCH=15
 else
          VERSION=0.7.16
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index e5455e2..de988ef 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,8 @@
+2015-12-23 Eric Sandall <sandalle AT sourcemage.org>
+       * DETAILS: Updated to 2.8.4
+       * PRE_BUILD: libvpx-1.5.patch no longer needed
+       * libvpx-1.5.patch: Removed, already applied
+
 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
diff --git a/video/ffmpeg/PRE_BUILD b/video/ffmpeg/PRE_BUILD
index 8de7bc9..db36624 100755
--- a/video/ffmpeg/PRE_BUILD
+++ b/video/ffmpeg/PRE_BUILD
@@ -10,9 +10,4 @@ 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  &&
-
-
-message "${MESSAGE_COLOR}Apply fix for libvpx 1.5 API...${DEFAULT_COLOR}"  &&
-patch "${SOURCE_DIRECTORY}"/libavcodec/libvpxenc.c  \
-      "${SPELL_DIRECTORY}"/libvpx-1.5.patch
+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