ports/57545: multimedia/mplayer: some fixes

[Thomas E. Zander]

>Number:         57545
>Category:       ports
>Synopsis:       multimedia/mplayer: some fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 03 10:20:10 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Thomas E. Zander
>Release:        FreeBSD 5.1-RELEASE-p7 i386
>Organization:
>Environment:
System: FreeBSD o503.hadiko.de 5.1-RELEASE-p7 FreeBSD 5.1-RELEASE-p7 #0: Thu Sep 25 13:32:49 CEST 2003 root at o503.hadiko.de:/usr/obj/usr/src/sys/MARVIN i386
>Description:
o Correct use of SDL, suggested by Thierry Thomas <thierry at pompo.net>
  update lib dependency of sdl; satisfies pr/57475
o new patchfile: patch-libmpdvdkit2-dvd_reader.c
  better dvd device handling for FreeBSD
  by FUJISHIMA Satsuki <sf at freebsd.org>
>How-To-Repeat:
>Fix:

Please apply this to multimedia/mplayer:

diff -ruN mplayer-old/Makefile mplayer/Makefile
--- mplayer-old/Makefile	Mon Sep 29 11:34:59 2003
+++ mplayer/Makefile	Fri Oct  3 18:31:10 2003
@@ -166,6 +166,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	0.92.0
+PORTREVISION=	1
 CATEGORIES=	multimedia audio ipv6
 MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/ \
 		http://www2.mplayerhq.hu/MPlayer/releases/ \
@@ -260,7 +261,7 @@
 WITH_AALIB=	yes
 .endif
 
-.if exists(${LOCALBASE}/lib/libSDL-1.1.so.5)
+.if exists(${LOCALBASE}/lib/libSDL-1.1.so.6)
 WITH_SDL=	yes
 WITH_AALIB=	yes
 .endif
@@ -395,7 +396,7 @@
 .endif
 
 .if defined(WITH_SDL)
-LIB_DEPENDS+=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
+USE_SDL=	yes
 .endif
 
 .if defined(WITH_ESOUND)
diff -ruN mplayer-old/files/patch-libmpdvdkit2-dvd_reader.c mplayer/files/patch-libmpdvdkit2-dvd_reader.c
--- mplayer-old/files/patch-libmpdvdkit2-dvd_reader.c	Thu Jan  1 01:00:00 1970
+++ mplayer/files/patch-libmpdvdkit2-dvd_reader.c	Fri Oct  3 18:17:48 2003
@@ -0,0 +1,22 @@
+--- libmpdvdkit2/dvd_reader.c.orig	Sat Aug  9 16:12:35 2003
++++ libmpdvdkit2/dvd_reader.c	Fri Oct  3 18:16:43 2003
+@@ -239,6 +239,11 @@
+    Darwin  /dev/rdisk0,  it needs to be the raw device
+    BSD/OS  /dev/sr0c (if not mounted) or /dev/rsr0c ('c' any letter will do) */
+ static char *bsd_block2char( const char *path )
++#if defined(__FreeBSD__)
++{
++    return (char *) strdup( path );
++}
++#else
+ {
+     char *new_path;
+ 
+@@ -253,6 +258,7 @@
+ 
+     return new_path;
+ }
++#endif /* __FreeBSD__ */
+ #endif
+ 
+ dvd_reader_t *DVDOpen( const char *path )
>Release-Note:
>Audit-Trail:
>Unformatted: