Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

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

 
http/firefox-esr/0001-Bug-1435212-Add-support-for-FFmpeg-4.0.-r-bryce.patch.xz
 |binary
 http/firefox-esr/DETAILS                                                     
  |    1 +
 http/firefox-esr/HISTORY                                                     
  |    5 +++++
 http/firefox-esr/PRE_BUILD                                                   
  |    2 ++
 video-libs/x264/DETAILS                                                      
  |    4 ++--
 video-libs/x264/HISTORY                                                      
  |    3 +++
 6 files changed, 13 insertions(+), 2 deletions(-)

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

    video-libs/x264: version 20180615-2245

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

    http/firefox-esr: fix compatibility with ffmpeg 4

diff --git 
a/http/firefox-esr/0001-Bug-1435212-Add-support-for-FFmpeg-4.0.-r-bryce.patch.xz
 
b/http/firefox-esr/0001-Bug-1435212-Add-support-for-FFmpeg-4.0.-r-bryce.patch.xz
new file mode 100644
index 0000000..7218515
Binary files /dev/null and 
b/http/firefox-esr/0001-Bug-1435212-Add-support-for-FFmpeg-4.0.-r-bryce.patch.xz
 differ
diff --git a/http/firefox-esr/DETAILS b/http/firefox-esr/DETAILS
index b344ac1..38530bd 100755
--- a/http/firefox-esr/DETAILS
+++ b/http/firefox-esr/DETAILS
@@ -1,6 +1,7 @@
            SPELL=firefox-esr
           SPELLX=firefox
          VERSION=60.0.2esr
+      PATCHLEVEL=1
           SOURCE=$SPELLX-$VERSION.source.tar.xz
      
SOURCE_HASH=sha512:c147517e37ecb6340dab29f4bcbaeb18450eda0fbd2bdfda1ab0c160de9ad33572113866c1ed4feba6a77bec432a2e02fb5cbcceb73e4a45ceef308f04d2b836
    
SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELLX}/releases/${VERSION}/source/${SOURCE}
diff --git a/http/firefox-esr/HISTORY b/http/firefox-esr/HISTORY
index c2b1f5d..5721d46 100644
--- a/http/firefox-esr/HISTORY
+++ b/http/firefox-esr/HISTORY
@@ -1,3 +1,8 @@
+2018-06-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * 0001-Bug-1435212-Add-support-for-FFmpeg-4.0.-r-bryce.patch.xz, 
PRE_BUILD:
+         add patch from archlinux to fix compatibility with ffmpeg 4
+       * DETAILS: PATCHLEVEL++
+
 2018-06-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 60.0.2esr, SECURITY_PATCH++
 
diff --git a/http/firefox-esr/PRE_BUILD b/http/firefox-esr/PRE_BUILD
index 41c4c46..16fe981 100755
--- a/http/firefox-esr/PRE_BUILD
+++ b/http/firefox-esr/PRE_BUILD
@@ -2,6 +2,8 @@ default_pre_build  &&
 cd  $SOURCE_DIRECTORY &&
 
 #apply_patch_dir patches &&
+xzcat 
"$SPELL_DIRECTORY/0001-Bug-1435212-Add-support-for-FFmpeg-4.0.-r-bryce.patch.xz"
 | patch -p1 &&
+
 
 # To remove version suffix from some directories
 sed 's;-$(MOZ_APP_VERSION);;g' -i config/baseconfig.mk &&
diff --git a/video-libs/x264/DETAILS b/video-libs/x264/DETAILS
index ec4e288..a9a5222 100755
--- a/video-libs/x264/DETAILS
+++ b/video-libs/x264/DETAILS
@@ -1,9 +1,9 @@
            SPELL=x264
 #        VERSION="$(date --date='1 day ago' +%Y%m%d)"-2245
-         VERSION=20180613-2245
+         VERSION=20180615-2245
           SOURCE=$SPELL-snapshot-$VERSION.tar.bz2
    SOURCE_URL[0]=ftp://ftp.videolan.org/pub/videolan/x264/snapshots/$SOURCE
-     
SOURCE_HASH=sha512:36843157d66c3e74f6cf348ac4b9341645f9018d99384e92eff18c10e862d630547aa1b6d5f57865f9b73a9e6dcb4c7153e7612a9921d05f1864a06b2a7a35ef
+     
SOURCE_HASH=sha512:e83c57bf7631df2b7e14ad0ddf64902c15a4df06a4b6806192bcfdec13424c634cfe9572ddd8531aee0f4978187a4adb4419020b0a762291c7fbcc85384147c3
 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 57c7613..825728a 100644
--- a/video-libs/x264/HISTORY
+++ b/video-libs/x264/HISTORY
@@ -1,3 +1,6 @@
+2018-06-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 20180615-2245
+
 2018-06-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 20180613-2245