Attachment 125209 Details for Bug 168798 – file.diff

[patch] file.diff

file.diff (text/plain), 6.54 KB, created by Mickael Maillot on 2012-06-07 13:00:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mickael Maillot

Created: 2012-06-07 13:00:38 UTC

Size: 6.54 KB

patch

obsolete

>--- Makefile.orig	2012-06-07 13:50:20.000000000 +0200
>+++ Makefile	2012-06-06 08:24:26.000000000 +0200
>@@ -25,32 +25,32 @@
> 		nasm:${PORTSDIR}/devel/nasm \
> 		dvdread-config:${PORTSDIR}/multimedia/libdvdread \
> 		gtk-update-icon-cache:${PORTSDIR}/x11-toolkits/gtk20
>-LIB_DEPENDS=	ass.5:${PORTSDIR}/multimedia/libass \
>-		boost_thread.4:${PORTSDIR}/devel/boost-libs \
>-		cdio.13:${PORTSDIR}/sysutils/libcdio	\
>-		curl.6:${PORTSDIR}/ftp/curl \
>-		dbus-1.3:${PORTSDIR}/devel/dbus \
>-		enca.5:${PORTSDIR}/converters/enca \
>-		GLEW.1:${PORTSDIR}/graphics/glew \
>-		avcodec.1:${PORTSDIR}/multimedia/ffmpeg	\
>-		FLAC.10:${PORTSDIR}/audio/flac \
>-		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
>-		freetype.9:${PORTSDIR}/print/freetype2 \
>-		fribidi.3:${PORTSDIR}/converters/fribidi \
>-		lzo2.2:${PORTSDIR}/archivers/lzo2 \
>-		jasper.4:${PORTSDIR}/graphics/jasper \
>-		jpeg.11:${PORTSDIR}/graphics/jpeg \
>+LIB_DEPENDS=	ass:${PORTSDIR}/multimedia/libass \
>+		boost_thread:${PORTSDIR}/devel/boost-libs \
>+		cdio:${PORTSDIR}/sysutils/libcdio	\
>+		curl:${PORTSDIR}/ftp/curl \
>+		dbus-1:${PORTSDIR}/devel/dbus \
>+		enca:${PORTSDIR}/converters/enca \
>+		GLEW:${PORTSDIR}/graphics/glew \
>+		avcodec:${PORTSDIR}/multimedia/ffmpeg	\
>+		FLAC:${PORTSDIR}/audio/flac \
>+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
>+		freetype:${PORTSDIR}/print/freetype2 \
>+		fribidi:${PORTSDIR}/converters/fribidi \
>+		lzo2:${PORTSDIR}/archivers/lzo2 \
>+		jasper:${PORTSDIR}/graphics/jasper \
>+		jpeg:${PORTSDIR}/graphics/jpeg \
> 		mad:${PORTSDIR}/audio/libmad \
> 		modplug:${PORTSDIR}/audio/libmodplug \
> 		mpeg2:${PORTSDIR}/multimedia/libmpeg2 \
>-		ogg.7:${PORTSDIR}/audio/libogg \
>-		pcre.1:${PORTSDIR}/devel/pcre \
>-		plist.1:${PORTSDIR}/devel/libplist \
>+		ogg:${PORTSDIR}/audio/libogg \
>+		pcre:${PORTSDIR}/devel/pcre \
>+		plist:${PORTSDIR}/devel/libplist \
> 		png15:${PORTSDIR}/graphics/png \
>-		samplerate.1:${PORTSDIR}/audio/libsamplerate \
>-		smbclient.0:${PORTSDIR}/net/samba-libsmbclient	\
>-		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
>-		vorbis.4:${PORTSDIR}/audio/libvorbis \
>+		samplerate:${PORTSDIR}/audio/libsamplerate \
>+		smbclient:${PORTSDIR}/net/samba-libsmbclient	\
>+		sqlite3:${PORTSDIR}/databases/sqlite3 \
>+		vorbis:${PORTSDIR}/audio/libvorbis \
> 		yajl:${PORTSDIR}/devel/yajl
> RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
> 		glxinfo:${PORTSDIR}/graphics/mesa-demos \
>@@ -71,18 +71,7 @@
> NOPRECIOUSMAKEVARS=	yes
> INSTALLS_ICONS=	yes
> ONLY_FOR_ARCHS=	i386 amd64
>-
>-OPTIONS=	AVAHI		"Enable Avahi support"			on \
>-		LIBBLURAY	"Enable libbluray support"		on \
>-		HAL		"Enable HAL support"			on \
>-		LIRC		"Enable lirc support"			off \
>-		NONFREE		"Enable non-free components (rar, ccx, ffmpeg)"	off \
>-		OSS		"Enable experimental OSS support"	off \
>-		PULSE		"Enable PulseAudio support"		off \
>-		RTMP		"RTMP support via librtmp"		on \
>-		VAAPI		"Enable VAAPI support"			off \
>-		VDPAU		"Enable VDPAU support"			off \
>-		WEBSERVER	"Build Internal Webserver"		on
>+CONFLICTS_INSTALL=	xbmc-pva-ppa-odk-[0-9]*
> 
> DESKTOP_ENTRIES="XBMC" \
> 		"${COMMENT}" \
>@@ -91,11 +80,16 @@
> 		"AudioVideo;Video;" \
> 		true
> 
>+OPTIONS_DEFINE=	AVAHI LIBBLURAY HAL LIRC NONFREE OSS PULSEAUDIO RTMP VAAPI VDPAU WEBSERVER
>+NONFREE_DESC=		Enable non-free components (rar, ccx, ffmpeg)
>+
>+OPTIONS_DEFAULT=AVAHI LIBBLURAY HAL RTMP WEBSERVER
>+
> CONFIGURE_ARGS+=	--disable-nfs
> 
>-.include <bsd.port.pre.mk>
>+.include <bsd.port.options.mk>
> 
>-.if defined(WITH_DEBUG)
>+.if ${PORT_OPTIONS:MDEBUG}
> CONFIGURE_ARGS+=	--enable-debug
> .else
> CONFIGURE_ARGS+=	--disable-debug
>@@ -107,32 +101,32 @@
> PLIST_SUB+=	ARCH="x86_64"
> .endif
> 
>-.if !defined(WITHOUT_AVAHI)
>+.if ${PORT_OPTIONS:MAVAHAHI}
> CONFIGURE_ARGS+=	--enable-avahi
>-LIB_DEPENDS+=	avahi-common.3:${PORTSDIR}/net/avahi-app
>+LIB_DEPENDS+=	avahi-common:${PORTSDIR}/net/avahi-app
> .else
> CONFIGURE_ARGS+=	--disable-avahi
> .endif
> 
>-.if !defined(WITHOUT_LIBBLURAY)
>+.if ${PORT_OPTIONS:MLIBBLURAY}
> CONFIGURE_ARGS+=	--enable-libbluray
>-LIB_DEPENDS+=	bluray.2:${PORTSDIR}/multimedia/libbluray
>+LIB_DEPENDS+=	bluray:${PORTSDIR}/multimedia/libbluray
> .else
> CONFIGURE_ARGS+=	--disable-libbluray
> .endif
> 
>-.if !defined(WITHOUT_HAL)
>+.if ${PORT_OPTIONS:MHAL}
> CONFIGURE_ARGS+=	--enable-hal
>-LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
>+LIB_DEPENDS+=	hal:${PORTSDIR}/sysutils/hal
> .else
> CONFIGURE_ARGS+=	--disable-hal
> .endif
> 
>-.if defined(WITH_LIRC)
>+.if ${PORT_OPTIONS:MLIRC}
> RUN_DEPENDS+=	lircd:${PORTSDIR}/comms/lirc
> .endif
> 
>-.if defined(WITH_NONFREE)
>+.if ${PORT_OPTIONS:MNONFREE}
> CONFIGURE_ARGS+=	--enable-non-free
> NO_CDROM=	Restricted binary distribution
> NO_PACKAGE=	${NO_CDROM}
>@@ -140,48 +134,48 @@
> CONFIGURE_ARGS+=	--disable-non-free
> .endif
> 
>-.if defined(WITH_OSS)
>+.if ${PORT_OPTIONS:MOSS}
> .if ${OSVERSION} <= 800096
> IGNORE=	requires sound rewrite from 8.0-RELEASE or later
> .endif
> CONFIGURE_ARGS+=	--disable-alsa
> .else
>-LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
>+LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
> RUN_DEPENDS+=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
> USE_SDL+=	mixer
> .endif
> 
>-.if defined(WITH_PULSE)
>+.if ${PORT_OPTIONS:MPULSEAUDIO}
> CONFIGURE_ARGS+=	--enable-pulse
>-LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
>+LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
> .else
> CONFIGURE_ARGS+=	--disable-pulse
> .endif
> 
>-.if defined(WITH_RTMP)
>+.if ${PORT_OPTIONS:MRTMP}
> CONFIGURE_ARGS+=	--enable-rtmp
>-LIB_DEPENDS+=	rtmp.0:${PORTSDIR}/multimedia/rtmpdump
>+LIB_DEPENDS+=	rtmp:${PORTSDIR}/multimedia/rtmpdump
> .else
> CONFIGURE_ARGS+=	--disable-rtmp
> .endif
> 
>-.if defined(WITH_VAAPI)
>-LIB_DEPENDS+=	va.1:${PORTSDIR}/multimedia/libva
>+.if ${PORT_OPTIONS:MVAAPI}
>+LIB_DEPENDS+=	va:${PORTSDIR}/multimedia/libva
> CONFIGURE_ARGS+=	--enable-vaapi
> .else
> CONFIGURE_ARGS+=	--disable-vaapi
> .endif
> 
>-.if defined(WITH_VDPAU)
>-LIB_DEPENDS+=	vdpau.1:${PORTSDIR}/multimedia/libvdpau
>+.if ${PORT_OPTIONS:MVDPAU}
>+LIB_DEPENDS+=	vdpau:${PORTSDIR}/multimedia/libvdpau
> CONFIGURE_ARGS+=	--enable-vdpau
> .else
> CONFIGURE_ARGS+=	--disable-vdpau
> .endif
> 
>-.if defined(WITH_WEBSERVER)
>+.if ${PORT_OPTIONS:MWEBSERVER}
> CONFIGURE_ARGS+=	--enable-webserver
>-LIB_DEPENDS+=	microhttpd.23:${PORTSDIR}/www/libmicrohttpd
>+LIB_DEPENDS+=	microhttpd:${PORTSDIR}/www/libmicrohttpd
> .else
> CONFIGURE_ARGS+=	--disable-webserver
> .endif
>@@ -194,7 +188,7 @@
> .endif
> 
> post-patch:
>-.if defined(WITH_OSS)
>+.if ${PORT_OPTIONS:MOSS}
> 	@(cd ${WRKSRC}; \
> 	${BZCAT} ${FILESDIR}/extra-patch-oss.bz2 | ${PATCH} ${PATCH_DIST_ARGS})
> 	@${RM} ${WRKSRC}/language/English/strings.xml.orig
>@@ -204,4 +198,4 @@
> pre-configure:
> 	cd ${WRKSRC} && ./bootstrap
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>

Actions: View | Diff

Attachments on bug 168798: 125209