[arch-commits] Commit in cinelerra-cv/trunk (PKGBUILD gcc5fix.patch)

[Ray Rashif]

    Date: Tuesday, June 9, 2015 @ 23:43:14
  Author: schiv
Revision: 135108

cinelerra-cv: gcc 5.x fix and some cleanup

Added:
  cinelerra-cv/trunk/gcc5fix.patch
Modified:
  cinelerra-cv/trunk/PKGBUILD

---------------+
 PKGBUILD      |   21 +++++++++++----------
 gcc5fix.patch |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-09 19:38:03 UTC (rev 135107)
+++ PKGBUILD	2015-06-09 21:43:14 UTC (rev 135108)
@@ -21,12 +21,14 @@
         'v4l1_removal.patch'
         'ffmpeg_api.patch'
         'ffmpeg2.0.patch'
-        'cinelerra-std_and_str_h.patch')
+        'cinelerra-std_and_str_h.patch'
+        'gcc5fix.patch')
 md5sums=('SKIP'
          'bfa85e20809429d88eba4ab83e569612'
          'b05ec2fb54e7d02f6167525417802111'
          '14dd897084d64cd0b5e9caa8a69818bd'
-         '02d8222e596133bbc05eaad15bef242c')
+         '02d8222e596133bbc05eaad15bef242c'
+         '7bf8fe04ce242d8aa76dba94897eac4e')
 
 _confit() {
   ./configure --prefix=/usr \
@@ -57,19 +59,18 @@
 
   # if you don't need OpenGL comment out the next line (and no glu/mesa dep)
   # TODO: check if this is still needed (pre-svn commit) --schiv
-  sed -i '/\/X11R6/s///' configure.in
+  #sed -i '/\/X11R6/s///' configure.in
 
   # TODO: check if this is still needed (old commit; r29539 by ibiru) --schiv
-  sed -i -e '/Debian/d' admin/nasm
+  #sed -i -e '/Debian/d' admin/nasm
 
-  # fix some pngs that break with newer libpng
-  # see https://mailman.archlinux.org/pipermail/arch-dev-public/2013-May/024872.html
-  #msg2 "Fixing PNGs, please wait..."
-  #find -name '*.png' -exec optipng -quiet -force -fix {} +
-
   # ffmpeg 2.0 related replacements
+  # TODO: super slow on HDDs, but proper patch requires merging with others
   find -type f -exec sed -i 's/AVCODEC_MAX_AUDIO_FRAME_SIZE/192000/' {} \;
   find -type f -exec sed -i 's/CodecID/AVCodecID/' {} \;
+
+  # gcc 5.x fix
+  patch -Np1 -i "$srcdir/gcc5fix.patch"
 }
 
 build() {
@@ -86,7 +87,7 @@
 
   ./autogen.sh
 
-  # TODO: check if this is still needed (pre-svn commit) --schiv
+  # asm failure for mmx on x64
   if [ "$CARCH" = 'x86_64' ]; then
     _confit --disable-mmx
   else

Added: gcc5fix.patch
===================================================================
--- gcc5fix.patch	                        (rev 0)
+++ gcc5fix.patch	2015-06-09 21:43:14 UTC (rev 135108)
@@ -0,0 +1,33 @@
+From e534e852308abaa667c2579bc0025b0c89689b6f Mon Sep 17 00:00:00 2001
+From: Rashif Rahman (Ray) <schiv at archlinux.org>
+Date: Wed, 10 Jun 2015 02:06:36 +0000
+Subject: [PATCH] GCC 5.x inline function semantics fix
+
+The compiler will warn and the linker will fail if an inline
+function is declared but not defined in the same translation
+unit. This fixes the problem by prepending 'extern' to the
+declaration in the header file.
+
+For a proper explanation see:
+https://gcc.gnu.org/gcc-5/porting_to.html
+
+---
+ toolame-02l/bitstream.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/toolame-02l/bitstream.h b/toolame-02l/bitstream.h
+index 66f8ae4..db67ac5 100644
+--- a/toolame-02l/bitstream.h
++++ b/toolame-02l/bitstream.h
+@@ -9,7 +9,7 @@ unsigned int get1bit (Bit_stream_struc *);
+ void put1bit (Bit_stream_struc *, int);
+ unsigned long look_ahead (Bit_stream_struc *, int);
+ unsigned long getbits (Bit_stream_struc *, int);
+-INLINE void putbits (Bit_stream_struc *, unsigned int, int);
++extern INLINE void putbits (Bit_stream_struc *, unsigned int, int);
+ void byte_ali_putbits (Bit_stream_struc *, unsigned int, int);
+ unsigned long byte_ali_getbits (Bit_stream_struc *, int);
+ unsigned long sstell (Bit_stream_struc *);
+--
+2.4.2
+