From 15c8c4d95d8e7b1aa02e9ec2670f4ea7b89caf95 Mon Sep 17 00:00:00 2001 From: tron Date: Wed, 13 Feb 2013 18:23:59 +0000 Subject: Pullup ticket #4063 - requested by he pkgsrc/multimedia/gmplayer: build fix pkgsrc/multimedia/mencoder: build fix pkgsrc/multimedia/mplayer: build fix Revisions pulled up: - multimedia/gmplayer/distinfo 1.80 - multimedia/mplayer-share/Makefile.common 1.52 - multimedia/mplayer-share/distinfo 1.80 - multimedia/mplayer-share/patches/patch-aa 1.31 --- Module Name: pkgsrc Committed By: jmcneill Date: Thu Jan 10 23:30:53 UTC 2013 Modified Files: pkgsrc/multimedia/mplayer-share: Makefile.common Log Message: libavutil moved to ffmpeg/libavutil, fix for arm build --- Module Name: pkgsrc Committed By: jmcneill Date: Sat Jan 12 11:55:35 UTC 2013 Modified Files: pkgsrc/multimedia/gmplayer: distinfo pkgsrc/multimedia/mplayer-share: distinfo pkgsrc/multimedia/mplayer-share/patches: patch-aa Log Message: Fix configure script to correctly identify the host architecture on NetBSD/evbarm. --- multimedia/gmplayer/distinfo | 4 ++-- multimedia/mplayer-share/Makefile.common | 7 ++++--- multimedia/mplayer-share/distinfo | 4 ++-- multimedia/mplayer-share/patches/patch-aa | 14 ++++++++------ 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/multimedia/gmplayer/distinfo b/multimedia/gmplayer/distinfo index 27913d8d83a..481927cdd21 100644 --- a/multimedia/gmplayer/distinfo +++ b/multimedia/gmplayer/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.79 2012/12/05 19:15:32 martin Exp $ +$NetBSD: distinfo,v 1.79.2.1 2013/02/13 18:23:59 tron Exp $ SHA1 (mplayer/AlienMind-1.2.tar.bz2) = 34370da1e003e4accceae194a63483aa6eebc4dc RMD160 (mplayer/AlienMind-1.2.tar.bz2) = f3fda7d44a59f98097162f76d0a0d58840974998 @@ -63,7 +63,7 @@ Size (mplayer/xanim-1.6.tar.bz2) = 94564 bytes SHA1 (mplayer/xine-lcd-1.2.tar.bz2) = 2fa7811e0dc7316d0c996b0a5bc37f5c97d1dd18 RMD160 (mplayer/xine-lcd-1.2.tar.bz2) = 785f6826d49eddabd7ebc431db77139771f208f5 Size (mplayer/xine-lcd-1.2.tar.bz2) = 172270 bytes -SHA1 (patch-aa) = 9a917441fdd2edfd7808f4c97fd5ca9ee2538392 +SHA1 (patch-aa) = da461823d0731624de964323ab630f6e295be7b7 SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67 SHA1 (patch-an) = a1d16ce7a4ff5a2071a7bac1b6836dc197b849e4 SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5 diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common index d77a0db6b0e..e0c6f29b7c4 100644 --- a/multimedia/mplayer-share/Makefile.common +++ b/multimedia/mplayer-share/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.51 2012/06/11 13:41:12 wiz Exp $ +# $NetBSD: Makefile.common,v 1.51.6.1 2013/02/13 18:23:59 tron Exp $ # used by multimedia/gmplayer/Makefile # used by multimedia/mencoder/Makefile # used by multimedia/mplayer/Makefile @@ -57,11 +57,12 @@ CONFIGURE_ARGS+= --enable-big-endian .if !empty(MACHINE_PLATFORM:MNetBSD-*-arm) # Avoid crash with system include file: pre-patch: - mv ${WRKSRC}/libavutil/arm/bswap.h ${WRKSRC}/libavutil/arm/avbswap.h + mv ${WRKSRC}/ffmpeg/libavutil/arm/bswap.h \ + ${WRKSRC}/ffmpeg/libavutil/arm/avbswap.h SUBST_CLASSES+= arm_bswap SUBST_STAGE.arm_bswap= pre-configure -SUBST_FILES.arm_bswap= libavutil/bswap.h +SUBST_FILES.arm_bswap= ffmpeg/libavutil/bswap.h SUBST_SED.arm_bswap= -e s,\"arm/bswap.h\",\"arm/avbswap.h\",g SUBST_MESSAGE.arm_bswap= Fixing "arm/bswap.h" conflict in libavutil diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo index c09022632e4..dd1581a1507 100644 --- a/multimedia/mplayer-share/distinfo +++ b/multimedia/mplayer-share/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.79 2012/11/29 17:27:17 drochner Exp $ +$NetBSD: distinfo,v 1.79.2.1 2013/02/13 18:23:59 tron Exp $ SHA1 (mplayer/MPlayer-1.1.tar.gz) = e46e3294bc96daabe604e4e195721e4f2d1e5b48 RMD160 (mplayer/MPlayer-1.1.tar.gz) = 0369e57677c0c30f3b05f80ee1c4d8d7d1217e63 Size (mplayer/MPlayer-1.1.tar.gz) = 17018391 bytes -SHA1 (patch-aa) = 9a917441fdd2edfd7808f4c97fd5ca9ee2538392 +SHA1 (patch-aa) = da461823d0731624de964323ab630f6e295be7b7 SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67 SHA1 (patch-an) = a1d16ce7a4ff5a2071a7bac1b6836dc197b849e4 SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5 diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa index f1c59e57c8c..a6287f36eea 100644 --- a/multimedia/mplayer-share/patches/patch-aa +++ b/multimedia/mplayer-share/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.30 2012/11/29 17:27:17 drochner Exp $ +$NetBSD: patch-aa,v 1.30.2.1 2013/02/13 18:23:59 tron Exp $ -o Handle properly sh3 ports on NetBSD. +o Handle properly sh3 and evbarm ports on NetBSD. o Fix CPU family detection on NetBSD with /proc mounted with "-o linux" (please see also kern/25076). o Fix a bug which broke the detection of a lot of X11 libraries. @@ -8,13 +8,15 @@ o Add necessary libs for aalib support even if the aa option is turned on with --enable-aa. o Add support for dvb capture on NetBSD. ---- configure.orig 2012-05-22 18:01:51.000000000 +0000 -+++ configure -@@ -1520,7 +1520,8 @@ if test -z "$_target" ; then +--- configure.orig 2012-05-22 14:01:51.000000000 -0400 ++++ configure 2013-01-11 22:15:07.000000000 -0500 +@@ -1519,8 +1519,9 @@ if test -z "$_target" ; then + alpha) host_arch=alpha ;; sun4*|sparc*) host_arch=sparc ;; parisc*|hppa*|9000*) host_arch=hppa ;; - arm*|zaurus|cats) host_arch=arm ;; +- arm*|zaurus|cats) host_arch=arm ;; - sh3|sh4|sh4a) host_arch=sh ;; ++ arm*|zaurus|cats|evbarm) host_arch=arm ;; + sh3*) host_arch=sh ;; + sh4|sh4a) host_arch=sh4 ;; s390) host_arch=s390 ;; -- cgit v1.2.3