mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

Fix cdio support

Browse Source 
While on it:
Remove CDPARANOIA option
- broken with cdparanoia port anyway
- move CDIO from radio button group to standard (default off) OPTION
- remove radio button group CDPARANOIA/CDIO

Reported by:	Kris Moore (kris@pcbsd.org) via mail
MFH:		2015Q1
This commit is contained in:
Thomas Zander 2015-01-24 18:32:07 +00:00
parent 477bfb9139
commit 5db77513a2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=377807
5 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
multimedia/mencoder/Makefile
View File

@ -9,11 +9,11 @@ COMMENT= Convenient video file and movie encoder
.include "${.CURDIR}/../mplayer/Makefile.shared"
OPTIONS_DEFINE= AMR_NB AMR_WB BLURAY CDIO CDPARANOIA DEBUG \
DV FAAC FONTCONFIG FRIBIDI GIF GNUTLS GSM IPV6 JACK \
LADSPA LIBMNG LZO MAD NAS OCFLAGS OPENAL \
OPENJPEG OPUS PULSEAUDIO REAL RTCPU RTMP \
SCHROEDINGER SMB THEORA TWOLAME V4L VPX WIN32 X264 XVID
OPTIONS_DEFINE= AMR_NB AMR_WB BLURAY CDIO DEBUG DV FAAC FONTCONFIG \
FRIBIDI GIF GNUTLS GSM IPV6 JACK LADSPA LIBMNG LZO \
MAD NAS OCFLAGS OPENAL OPENJPEG OPUS PULSEAUDIO REAL \
RTCPU RTMP SCHROEDINGER SMB THEORA TWOLAME V4L VPX \
WIN32 X264 XVID
OPTIONS_DEFAULT=GIF GNUTLS IPV6 OCFLAGS RTCPU WIN32 X264 XVID

5
multimedia/mplayer/Makefile
View File

@ -9,16 +9,13 @@ COMMENT= High performance media player supporting many formats
.include "${.CURDIR}/Makefile.shared"
OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLURAY CACA DEBUG DV \
OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLURAY CACA CDIO DEBUG DV \
ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \
LADSPA LIBMNG LIRC LZO NAS OCFLAGS OPENAL OPENGL \
OPENJPEG OPUS PULSEAUDIO REAL RTC RTCPU RTMP \
SCHROEDINGER SDL SKINS SMB SVGALIB V4L VDPAU VPX \
WIN32 X11 X11DGA X11VM XINERAMA XVIDEO XVMC
OPTIONS_RADIO= RGCD
OPTIONS_RADIO_RGCD= CDIO CDPARANOIA
OPTIONS_DEFAULT=FONTCONFIG FRIBIDI GNUTLS IPV6 OCFLAGS OPENGL RTCPU \
SKINS WIN32 X11 X11DGA X11VM XINERAMA XVIDEO

5
multimedia/mplayer/Makefile.optvars
View File

@ -17,12 +17,9 @@ BLURAY_CONFIGURE_OFF= --disable-bluray
CACA_LIB_DEPENDS= libcaca.so:${PORTSDIR}/graphics/libcaca
CACA_CONFIGURE_OFF= --disable-caca
CDIO_LIB_DEPENDS= libcdio.so:${PORTSDIR}/sysutils/libcdio
CDIO_LIB_DEPENDS= libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
CDIO_CONFIGURE_OFF= --disable-libcdio
CDPARANOIA_LIB_DEPENDS= libcdda_paranoia.so:${PORTSDIR}/audio/cdparanoia
CDPARANOIA_CONFIGURE_OFF= --disable-cdparanoia
DV_LIB_DEPENDS= libdv.so:${PORTSDIR}/multimedia/libdv
DV_CONFIGURE_OFF= --disable-libdv

13
multimedia/mplayer/files/patch-configure
View File

@ -1,5 +1,5 @@
--- configure.orig 2014-12-17 22:02:44.000000000 +0100
+++ configure 2014-12-23 15:09:25.965346239 +0100
+++ configure 2015-01-24 17:13:38.903362604 +0100
@@ -646,7 +646,7 @@
_iwmmxt=auto
_mtrr=auto
@ -131,6 +131,17 @@
default_dvd_device=$default_cdrom_device
elif darwin ; then
default_dvd_device="/dev/rdiskN"
@@ -6133,8 +6143,8 @@
cat > $TMPC << EOF
#include <stdio.h>
#include <cdio/version.h>
-#include <cdio/cdda.h>
-#include <cdio/paranoia.h>
+#include <cdio/paranoia/cdda.h>
+#include <cdio/paranoia/paranoia.h>
int main(void) {
void *test = cdda_verbose_set;
printf("%s\n", CDIO_VERSION);
@@ -6566,7 +6576,7 @@
echocheck "libgsm"
if test "$_libgsm" = auto ; then

13
multimedia/mplayer/files/patch-stream-stream_cdda.c Normal file
View File

@ -0,0 +1,13 @@
--- stream/stream_cdda.c.orig 2013-12-02 15:30:21.000000000 +0100
+++ stream/stream_cdda.c 2015-01-24 15:44:33.095742583 +0100
@@ -21,8 +21,8 @@
#include <cdda_interface.h>
#include <cdda_paranoia.h>
#else
-#include <cdio/cdda.h>
-#include <cdio/paranoia.h>
+#include <cdio/paranoia/cdda.h>
+#include <cdio/paranoia/paranoia.h>
#endif
#include <stdio.h>
#include <stdlib.h>