From 957b96a95f061116f3fa470e2581a08f06f44869 Mon Sep 17 00:00:00 2001 From: espie Date: Fri, 12 Aug 2005 22:59:15 +0000 Subject: [PATCH] the linux realmedia codec can't work: our dlopen won't load them correctly. More annoyingly, it abort()s the current process (thanks dale), so comment them out, add the win32 codecs, and use them instead. For some strange reason, the audio codec insists on being launched from its own directory. With this change, realmedia playing works. okay sturm@, okay pvalchev@ --- graphics/win32-codecs/Makefile | 15 ++++++----- graphics/win32-codecs/distinfo | 4 +++ graphics/win32-codecs/pkg/PLIST | 25 +++++++++++++------ x11/mplayer/Makefile | 4 +-- .../patches/patch-libmpcodecs_ad_realaud_c | 21 ++++++++++++++++ 5 files changed, 54 insertions(+), 15 deletions(-) create mode 100644 x11/mplayer/patches/patch-libmpcodecs_ad_realaud_c diff --git a/graphics/win32-codecs/Makefile b/graphics/win32-codecs/Makefile index fdca760ac90..3a7460e6cb1 100644 --- a/graphics/win32-codecs/Makefile +++ b/graphics/win32-codecs/Makefile @@ -1,11 +1,14 @@ -# $OpenBSD: Makefile,v 1.15 2005/04/16 07:48:47 sturm Exp $ +# $OpenBSD: Makefile,v 1.16 2005/08/12 22:59:15 espie Exp $ ONLY_FOR_ARCHS= i386 COMMENT= "Huge compilation of Win32 binary codecs" +DATE= 20050412 +DATE2= 20050115 -DISTNAME= all-20050412 -PKGNAME= ${DISTNAME:S,all-,win32-codecs-,g} +DISTNAME= win32-codecs-${DATE} +PKGNAME= ${DISTNAME}p0 +DISTFILES= all-${DATE}.tar.bz2 rp9codecs-win32-${DATE2}.tar.bz2 CATEGORIES= graphics MAINTAINER= Robert Nagy @@ -19,14 +22,14 @@ MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/codecs/ \ http://www2.mplayerhq.hu/MPlayer/releases/codecs/ \ ftp://mplayerhq.hu/MPlayer/releases/codecs/ \ ftp://ftp.lug.udel.edu/MPlayer/releases/codecs/ -EXTRACT_SUFX= .tar.bz2 NO_BUILD= Yes NO_REGRESS= Yes -WRKDIST= ${WRKDIR}/${DISTNAME} +WRKDIST= ${WRKDIR} do-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/win32 - ${INSTALL_DATA} ${WRKDIST}/* ${PREFIX}/lib/win32 + ${INSTALL_DATA} ${WRKDIST}/all-${DATE}/* ${PREFIX}/lib/win32 + ${INSTALL_DATA} ${WRKDIST}/rp9codecs-win32-${DATE2}/* ${PREFIX}/lib/win32 .include diff --git a/graphics/win32-codecs/distinfo b/graphics/win32-codecs/distinfo index 6d3c6e0f42f..bc784d9eb31 100644 --- a/graphics/win32-codecs/distinfo +++ b/graphics/win32-codecs/distinfo @@ -1,4 +1,8 @@ MD5 (all-20050412.tar.bz2) = 291780f05ff1ef78287749eee1ff2404 +MD5 (rp9codecs-win32-20050115.tar.bz2) = 6b56c1c127f5ac0c4c8a9878f24477ca RMD160 (all-20050412.tar.bz2) = 2b51c52e76c1aab8cb9332a65f23f5d56ee75546 +RMD160 (rp9codecs-win32-20050115.tar.bz2) = e768685ce05149f34c500c29289539ee6198ecca SHA1 (all-20050412.tar.bz2) = 39b949dacc015d8e3aa308c24c74a97598fe92c9 +SHA1 (rp9codecs-win32-20050115.tar.bz2) = 926f9b85747a4076882d98e4f808aa36771262e3 SIZE (all-20050412.tar.bz2) = 12963387 +SIZE (rp9codecs-win32-20050115.tar.bz2) = 540641 diff --git a/graphics/win32-codecs/pkg/PLIST b/graphics/win32-codecs/pkg/PLIST index 50690fa9da0..34261ac093d 100644 --- a/graphics/win32-codecs/pkg/PLIST +++ b/graphics/win32-codecs/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.14 2005/04/16 07:48:47 sturm Exp $ +@comment $OpenBSD: PLIST,v 1.15 2005/08/12 22:59:15 espie Exp $ lib/win32/ lib/win32/AvidQTAVUICodec.qtx lib/win32/BeHereiVideo.qtx @@ -8,10 +8,12 @@ lib/win32/DECVW_32.DLL lib/win32/LCMW2.dll lib/win32/LCODCCMW2E.dll lib/win32/LCodcCMP.dll +lib/win32/NOTE lib/win32/QuickTime.qts lib/win32/QuickTimeEssentials.qtx lib/win32/QuickTimeInternetExtras.qtx @comment lib/win32/README +@comment lib/win32/Readme.txt lib/win32/VDODEC32.dll lib/win32/ViVD2.dll lib/win32/acelpdec.ax @@ -23,11 +25,13 @@ lib/win32/asusasvd.dll lib/win32/ativcr2.dll lib/win32/atrac3.acm lib/win32/atrc.so.6.0 +lib/win32/atrc3260.dll lib/win32/avimszh.dll lib/win32/avizlib.dll lib/win32/clrviddd.dll -lib/win32/cook.so -lib/win32/cook.so.6.0 +@comment lib/win32/cook.so +@comment lib/win32/cook.so.6.0 +lib/win32/cook3260.dll lib/win32/ctadp32.acm lib/win32/ddnt.so.6.0 lib/win32/divx.dll @@ -36,10 +40,14 @@ lib/win32/divxa32.acm lib/win32/divxc32.dll lib/win32/divxdec.ax lib/win32/dnet.so.6.0 -lib/win32/drv2.so.6.0 -lib/win32/drv3.so.6.0 -lib/win32/drv4.so.6.0 -lib/win32/drvc.so +lib/win32/drv13260.dll +@comment lib/win32/drv2.so.6.0 +lib/win32/drv23260.dll +@comment lib/win32/drv3.so.6.0 +lib/win32/drv33260.dll +@comment lib/win32/drv4.so.6.0 +lib/win32/drv43260.dll +@comment lib/win32/drvc.so lib/win32/dspr.so.6.0 lib/win32/huffyuv.dll lib/win32/i263_32.drv @@ -77,16 +85,19 @@ lib/win32/msvidc32.dll lib/win32/mvoiced.vwp lib/win32/nsrt2432.acm lib/win32/pclepim1.dll +lib/win32/pncrt.dll lib/win32/qdv.dll lib/win32/qpeg32.dll lib/win32/qtmlClient.dll lib/win32/rt32dcmp.dll lib/win32/scg726.acm lib/win32/sipr.so.6.0 +lib/win32/sipr3260.dll lib/win32/sp5x_32.dll lib/win32/tm20dec.ax lib/win32/tokf.so.6.0 lib/win32/tokr.so.6.0 +lib/win32/tokr3260.dll lib/win32/tsccvid.dll lib/win32/tsd32.dll lib/win32/tssoft32.acm diff --git a/x11/mplayer/Makefile b/x11/mplayer/Makefile index e67be0822c4..42553a73402 100644 --- a/x11/mplayer/Makefile +++ b/x11/mplayer/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.86 2005/08/04 22:43:18 robert Exp $ +# $OpenBSD: Makefile,v 1.87 2005/08/12 22:59:15 espie Exp $ # May not be hard to add more. ONLY_FOR_ARCHS= amd64 i386 powerpc sparc64 arm @@ -7,7 +7,7 @@ COMMENT= "Movie player supporting MPEG, DivX, AVI, ASF, MOV & more" DISTNAME= MPlayer-1.0pre7 DIST_SUBDIR= mplayer -PKGNAME= ${DISTNAME:L}p2 +PKGNAME= ${DISTNAME:L}p3 CATEGORIES= x11 EXTRACT_SUFX= .tar.bz2 diff --git a/x11/mplayer/patches/patch-libmpcodecs_ad_realaud_c b/x11/mplayer/patches/patch-libmpcodecs_ad_realaud_c new file mode 100644 index 00000000000..be3d90bf6e9 --- /dev/null +++ b/x11/mplayer/patches/patch-libmpcodecs_ad_realaud_c @@ -0,0 +1,21 @@ +$OpenBSD: patch-libmpcodecs_ad_realaud_c,v 1.3 2005/08/12 22:59:16 espie Exp $ +--- libmpcodecs/ad_realaud.c.orig Fri Aug 12 03:24:32 2005 ++++ libmpcodecs/ad_realaud.c Fri Aug 12 03:26:04 2005 +@@ -253,9 +253,17 @@ static int preinit(sh_audio_t *sh){ + #ifdef USE_WIN32DLL + if (dll_type == 1) + { ++ int d; ++ ++ /* for some bizarre reasons, we have to be in the right directory ++ * for this to work. ++ */ ++ d = open(".", O_RDONLY); ++ chdir(REALCODEC_PATH); + for (i=0; i < strlen(path); i++) + if (path[i] == '/') path[i] = '\\'; + wraSetDLLAccessPath(path); ++ fchdir(d); + } + else + #endif