haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 22:48:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

faad2: bump to 2.8.8 (#3443)

Browse Source
This commit is contained in:
Robert Kausch
2018-12-07 07:44:02 +01:00
committed by Jérôme Duval
parent 3158083495
commit 83d4b113fb
3 changed files with 79 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
media-libs/faad2/patches/faad2-2.8.8.patchset Normal file
View File

@@ -0,0 +1,76 @@
From afac2897dbb4818461f1e8bd721c2a839cb3adf6 Mon Sep 17 00:00:00 2001
From: Robert Kausch <robert.kausch@freac.org>
Date: Tue, 4 Dec 2018 20:46:05 +0000
Subject: Patches for Haiku compatibility.
diff --git a/configure.ac b/configure.ac
index a03cafe..b03022d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,7 @@ AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_CHECK_PROGS(RPMBUILD, rpmbuild, rpm)
+AC_CHECK_LIBM
AC_CONFIG_HEADERS([config.h])
@@ -92,7 +93,7 @@ AC_DEFUN([AC_C99_FUNC_LRINTF],
ac_cv_c99_lrintf,
[
lrintf_save_CFLAGS=$CFLAGS
-CFLAGS="-O -lm"
+CFLAGS="-O $LIBM"
AC_TRY_LINK([
#define _ISOC9X_SOURCE 1
#define _ISOC99_SOURCE 1
diff --git a/frontend/mp4read.c b/frontend/mp4read.c
index 9767383..57b7fac 100644
--- a/frontend/mp4read.c
+++ b/frontend/mp4read.c
@@ -51,8 +51,10 @@ static inline uint32_t bswap32(const uint32_t u32)
#ifndef WORDS_BIGENDIAN
#ifdef _MSC_VER
return _byteswap_ulong(u32);
-#else
+#elif defined (__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
return __builtin_bswap32(u32);
+#else
+ return (u32 << 24) | ((u32 << 8) & 0xFF0000) | ((u32 >> 8) & 0xFF00) | (u32 >> 24);
#endif
#else
return u32;
@@ -64,8 +66,10 @@ static inline uint16_t bswap16(const uint16_t u16)
#ifndef WORDS_BIGENDIAN
#ifdef _MSC_VER
return _byteswap_ushort(u16);
-#else
+#elif defined (__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 8)))
return __builtin_bswap16(u16);
+#else
+ return (u16 << 8) | (u16 >> 8);
#endif
#else
return u16;
diff --git a/libfaad/Makefile.am b/libfaad/Makefile.am
index 8ed57ae..aa9c745 100644
--- a/libfaad/Makefile.am
+++ b/libfaad/Makefile.am
@@ -1,12 +1,11 @@
lib_LTLIBRARIES = libfaad.la libfaad_drm.la
-AM_CPPFLAGS = -iquote $(top_srcdir)/include
+AM_CPPFLAGS = -I $(top_srcdir)/include
include_HEADERS = $(top_srcdir)/include/faad.h \
$(top_srcdir)/include/neaacdec.h
libfaad_la_LDFLAGS = -version-info 2:0:0 -no-undefined
libfaad_la_LIBADD = -lm
-libfaad_la_CFLAGS = -fvisibility=hidden
libfaad_la_SOURCES = bits.c cfft.c decoder.c drc.c \
drm_dec.c error.c filtbank.c \
--
2.19.1