diff options
| -rw-r--r-- | recipes/mplayer/files/fix-addrinfo.patch | 101 | ||||
| -rw-r--r-- | recipes/mplayer/files/fix-exp.diff | 21 | ||||
| -rw-r--r-- | recipes/mplayer/mplayer_svn.bb | 7 |
3 files changed, 120 insertions, 9 deletions
diff --git a/recipes/mplayer/files/fix-addrinfo.patch b/recipes/mplayer/files/fix-addrinfo.patch new file mode 100644 index 0000000000..af254e4c94 --- /dev/null +++ b/recipes/mplayer/files/fix-addrinfo.patch @@ -0,0 +1,101 @@ +From d15b488e1d0945766da37c9c0f3e286833ecea20 Mon Sep 17 00:00:00 2001 +From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2> +Date: Thu, 14 Jan 2010 12:06:38 +0000 +Subject: Fix compilation after recent changes in FFmpeg. + +Patch by Etienne Buira, etienne D buira A free D fr + + +git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30302 b3059339-0415-0410-9bf9-f77b7e298cf2 +--- +diff --git a/configure b/configure +index 3dab6ba..ed5d89c 100755 +--- a/configure ++++ b/configure +@@ -680,6 +680,9 @@ _tv_dshow=auto + _pvr=auto + _network=yes + _winsock2_h=auto ++_struct_addrinfo=auto ++_getaddrinfo=auto ++_struct_sockaddr_storage=auto + _smb=auto + _vidix=auto + _vidix_pcidb=yes +@@ -3100,6 +3103,64 @@ else + fi + + ++echocheck "netdb.h, struct addrinfo" ++if test "$_struct_addrinfo" = auto; then ++ _struct_addrinfo=no ++ cat > $TMPC << EOF ++#include <sys/types.h> ++#include <sys/socket.h> ++#include <netdb.h> ++int main(void) { struct addrinfo ai; return 0; } ++EOF ++ cc_check && _struct_addrinfo=yes ++fi ++echores "$_struct_addrinfo" ++ ++if test "$_struct_addrinfo" = yes; then ++ def_addrinfo="#define HAVE_STRUCT_ADDRINFO 1" ++else ++ def_addrinfo="#define HAVE_STRUCT_ADDRINFO 0" ++fi ++ ++ ++echocheck "netdb.h, getaddrinfo()" ++if test "$_getaddrinfo" = auto; then ++ _getaddrinfo=no ++ cat > $TMPC << EOF ++#include <sys/types.h> ++#include <sys/socket.h> ++#include <netdb.h> ++int main(void) { (void) getaddrinfo(0, 0, 0, 0); return 0; } ++EOF ++ cc_check && _getaddrinfo=yes ++fi ++echores "$_getaddrinfo" ++ ++if test "$_getaddrinfo" = yes; then ++ def_getaddrinfo="#define HAVE_GETADDRINFO 1" ++else ++ def_getaddrinfo="define HAVE_GETADDRINFO 0" ++fi ++ ++ ++echocheck "sockaddr_storage" ++if test "$_struct_sockaddr_storage" = auto; then ++ _struct_sockaddr_storage=no ++ cat > $TMPC << EOF ++#include <sys/socket.h> ++int main(void) { struct sockaddr_storage sas; return 0; } ++EOF ++ cc_check && _struct_sockaddr_storage=yes ++fi ++echores "$_struct_sockaddr_storage" ++ ++if test "$_struct_sockaddr_storage" = yes; then ++ def_sockaddr_storage="#define HAVE_STRUCT_SOCKADDR_STORAGE 1" ++else ++ def_sockaddr_storage="#define HAVE_STRUCT_SOCKADDR_STORAGE 0" ++fi ++ ++ + echocheck "arpa/inet.h" + arpa_inet_h=no + def_arpa_inet_h='#define HAVE_ARPA_INET_H 0' +@@ -8907,6 +8968,9 @@ $def_network + $def_smb + $def_socklen_t + $def_vstream ++$def_addrinfo ++$def_getaddrinfo ++$def_sockaddr_storage + + + /* libvo options */ +-- +cgit v0.8.2.1-10-g45e7 diff --git a/recipes/mplayer/files/fix-exp.diff b/recipes/mplayer/files/fix-exp.diff index fd7352d6f2..bd8ac88f5b 100644 --- a/recipes/mplayer/files/fix-exp.diff +++ b/recipes/mplayer/files/fix-exp.diff @@ -1,8 +1,15 @@ -Index: configure -=================================================================== ---- configure (revision 30290) -+++ configure (revision 30291) -@@ -3006,7 +3006,7 @@ +From da70ef3840dff5972ca5d10c387d58c126eee94c Mon Sep 17 00:00:00 2001 +From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> +Date: Tue, 12 Jan 2010 19:41:44 +0000 +Subject: Add checks for exp2, exp2 and log2f required by FFmpeg. + +git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30291 b3059339-0415-0410-9bf9-f77b7e298cf2 +--- +diff --git a/configure b/configure +index fb69ac8..23da910 100755 +--- a/configure ++++ b/configure +@@ -3006,7 +3006,7 @@ if test "$_posix4" = yes ; then fi echores "$_posix4" @@ -11,7 +18,7 @@ Index: configure echocheck $func cat > $TMPC << EOF #include <math.h> -@@ -8682,12 +8682,15 @@ +@@ -8682,12 +8682,15 @@ $def_winsock2_h /* system functions */ @@ -27,3 +34,5 @@ Index: configure $def_lrint $def_lrintf $def_map_memalign +-- +cgit v0.8.2.1-10-g45e7 diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb index 0f21869cd8..58a4bc7d81 100644 --- a/recipes/mplayer/mplayer_svn.bb +++ b/recipes/mplayer/mplayer_svn.bb @@ -11,8 +11,9 @@ SRC_URI = "svn://svn.mplayerhq.hu/mplayer;module=trunk \ file://makefile-nostrip-svn.patch;patch=1 \ file://mplayer-arm-pld.patch;patch=1 \ file://mplayer-lavc-arm.patch;patch=1 \ - file://fix-exp.diff;patch=1;pnum=0;maxrev=30291 \ - " + file://fix-exp.diff;patch=1;maxrev=30291 \ + file://fix-addrinfo.patch;patch=1;maxrev=30302 \ +" SRCREV = "30247" SRC_URI_append_armv7a = " \ @@ -37,7 +38,7 @@ RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" PV = "0.0+1.0rc2+svnr${SRCPV}" -PR = "r16" +PR = "r17" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_angstrom = "1" |