diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-10-03 17:31:05 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-10-03 17:31:05 +0000 |
| commit | fca0ecf8d1dd8fdd0a9706f1673cc0b2ce6ecabd (patch) | |
| tree | 3031c3630cd98bb48cc4e17c1d6289e386738c0f | |
| parent | Add trf 0.4, billing software for traffic counting working with (diff) | |
* Correct use of SDL, update lib dependency of SDL [1]
* Better DVD device handling for FreeBSD [2]
PR: 57475 [1]
57545
Suggested by: Thierry Thomas <thierry@pompo.net> [1]
Obtained from: sf [2]
Submitted by: maintainer
| -rw-r--r-- | multimedia/mplayer/Makefile | 5 | ||||
| -rw-r--r-- | multimedia/mplayer/files/patch-libmpdvdkit2-dvd_reader.c | 22 |
2 files changed, 25 insertions, 2 deletions
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index fb8e61ece1b1..69604b27184f 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -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_SVGALIB= yes 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 @@ LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib .endif .if defined(WITH_SDL) -LIB_DEPENDS+= SDL-1.1.5:${PORTSDIR}/devel/sdl12 +USE_SDL= yes .endif .if defined(WITH_ESOUND) diff --git a/multimedia/mplayer/files/patch-libmpdvdkit2-dvd_reader.c b/multimedia/mplayer/files/patch-libmpdvdkit2-dvd_reader.c new file mode 100644 index 000000000000..a6dd471dec0b --- /dev/null +++ b/multimedia/mplayer/files/patch-libmpdvdkit2-dvd_reader.c @@ -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 ) |