Attachment 153166 Details for Bug 196299 – pre-commit fixup

[patch] pre-commit fixup

fixup.diff (text/plain), 6.63 KB, created by Jan Beich on 2015-02-19 08:22:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2015-02-19 08:22:56 UTC

Size: 6.63 KB

patch

obsolete

>diff --git MOVED MOVED
>index 2c17ee79..91fafef 100644
>--- MOVED
>+++ MOVED
>@@ -7425,3 +7425,4 @@ sysutils/brebis|sysutils/backupchecker|2015-02-12|Renamed to backupchecker
> sysutils/rsyslog7-devel|sysutils/rsyslog7|2015-02-13|Has expired: EoL, use sysutils/rsyslog7
> sysutils/rsyslog8-devel|sysutils/rsyslog8|2015-02-13|Has expired: EoL, use sysutils/rsyslog8
> japanese/mozc-additions||2015-02-15|Obsoleted by mozc script in japanese/mozc-server
>+multimedia/xbmc|multimedia/kodi|2015-02-20|Project renamed
>diff --git audio/Makefile audio/Makefile
>index d81b7d4..7fc65c6 100644
>--- audio/Makefile
>+++ audio/Makefile
>@@ -667,6 +667,7 @@
>     SUBDIR += sdl_mixer
>     SUBDIR += sdl_sound
>     SUBDIR += sfront
>+    SUBDIR += shairplay
>     SUBDIR += shairport
>     SUBDIR += shntool
>     SUBDIR += shorten
>diff --git audio/shairplay/Makefile audio/shairplay/Makefile
>index 03629dd..8993f4b 100644
>--- audio/shairplay/Makefile
>+++ audio/shairplay/Makefile
>@@ -7,17 +7,25 @@ CATEGORIES=	audio
> MAINTAINER=	mickael.maillot@gmail.com
> COMMENT=	Portable AirPlay server implementation
> 
>-LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao \
>-		libavahi-client.so:${PORTSDIR}/net/avahi-app
>+LICENSE=	BSD3CLAUSE LGPL21 MIT
>+LICENSE_COMB=	multi
> 
>-USES=		autoreconf gmake libtool pkgconfig
>-GNU_CONFIGURE=	yes
>-USE_LDCONFIG=	yes
>-INSTALL_TARGET=	install-strip
>+LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	juhovh
> GH_COMMIT=	64d59e3
> GH_TAGNAME=	${GH_COMMIT}
> 
>+USES=		autoreconf gmake libtool pkgconfig
>+GNU_CONFIGURE=	yes
>+USE_LDCONFIG=	yes
>+INSTALL_TARGET=	install-strip
>+
>+OPTIONS_DEFAULT=	MDNSRESPONDER
>+OPTIONS_SINGLE=		ZEROCONF
>+OPTIONS_SINGLE_ZEROCONF=	AVAHI MDNSRESPONDER
>+AVAHI_LIB_DEPENDS=		libdns_sd.so:${PORTSDIR}/net/avahi-libdns
>+MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder
>+
> .include <bsd.port.mk>
>diff --git audio/shairplay/pkg-descr audio/shairplay/pkg-descr
>index 28bcb4a..7268a36 100644
>--- audio/shairplay/pkg-descr
>+++ audio/shairplay/pkg-descr
>@@ -1,5 +1,4 @@
>-Shairplay
>-Free portable AirPlay server implementation similar to ShairPort.
>-Currently only AirPort Express emulation is supported.
>+Shairplay is a free portable AirPlay server implementation similar to
>+ShairPort. Currently only AirPort Express emulation is supported.
> 
> WWW: https://github.com/juhovh/shairplay
>diff --git multimedia/kodi/Makefile multimedia/kodi/Makefile
>index 2623f2b..40a4539 100644
>--- multimedia/kodi/Makefile
>+++ multimedia/kodi/Makefile
>@@ -4,19 +4,15 @@ PORTNAME=	kodi
> DISTVERSION=	14.0
> PORTREVISION=	0
> CATEGORIES=	multimedia
>-MASTER_SITES=	http://mirrors.kodi.tv/releases/source/ GH:ffmpeg
>-DISTFILES=  ${DISTVERSION}-Helix${EXTRACT_SUFX} ${GH_PROJECT}-${GH_TAGNAME}.tar.gz:ffmpeg
>-EXTRACT_ONLY=  ${DISTVERSION}-Helix${EXTRACT_SUFX}
>+MASTER_SITES=	http://mirrors.kodi.tv/releases/source/ \
>+		GH:ffmpeg
>+DISTFILES=	${DISTVERSION}-Helix${EXTRACT_SUFX} \
>+		${GH_PROJECT}-${GH_TAGNAME}.tar.gz:ffmpeg
>+EXTRACT_ONLY=	${DISTVERSION}-Helix${EXTRACT_SUFX}
> 
> MAINTAINER=	mickael.maillot@gmail.com
> COMMENT=	Award winning media center application
> 
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	xbmc
>-GH_PROJECT=	ffmpeg
>-GH_COMMIT=	8865ab5
>-GH_TAGNAME=	2.4.4-Helix
>-
> LICENSE=	GPLv2
> 
> BUILD_DEPENDS=	enca:${PORTSDIR}/converters/enca \
>@@ -58,8 +54,14 @@ LIB_DEPENDS=	libass.so:${PORTSDIR}/multimedia/libass \
> 		libyajl.so:${PORTSDIR}/devel/yajl
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
> 		glxinfo:${PORTSDIR}/graphics/mesa-demos \
>-		xdpyinfo:${PORTSDIR}/x11/xdpyinfo \
>-		python:${PORTSDIR}/lang/python
>+		python:${PORTSDIR}/lang/python \
>+		xdpyinfo:${PORTSDIR}/x11/xdpyinfo
>+
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	xbmc
>+GH_PROJECT=	ffmpeg
>+GH_COMMIT=	8865ab5
>+GH_TAGNAME=	2.4.4-Helix
> 
> USES=		gettext gmake iconv:wchar_t libtool:build pkgconfig python:2
> USE_AUTOTOOLS=	autoconf:env automake:env
>@@ -73,7 +75,7 @@ NOPRECIOUSMAKEVARS=	yes
> INSTALLS_ICONS=	yes
> ONLY_FOR_ARCHS=	i386 amd64
> 
>-WRKSRC=	${WRKDIR}/xbmc-${DISTVERSION}-Helix
>+WRKSRC=		${WRKDIR}/xbmc-${DISTVERSION}-Helix
> 
> OPTIONS_SUB=	yes
> OPTIONS_DEFINE=	AIRPLAY AIRTUNES AVAHI CEC DOCS \
>@@ -97,6 +99,7 @@ AIRTUNES_CONFIGURE_ENABLE=	airtunes
> AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
> AVAHI_CONFIGURE_ENABLE=	avahi
> 
>+CEC_BUILD_DEPENDS=	libcec>=2.2.0:${PORTSDIR}/multimedia/libcec
> CEC_LIB_DEPENDS=	libcec.so:${PORTSDIR}/multimedia/libcec
> CEC_CONFIGURE_ENABLE=	libcec
> 
>diff --git multimedia/kodi/files/patch-xbmc_threads_platform_pthreads_ThreadImpl.cpp multimedia/kodi/files/patch-xbmc_threads_platform_pthreads_ThreadImpl.cpp
>new file mode 100644
>index 0000000..4921560
>--- /dev/null
>+++ multimedia/kodi/files/patch-xbmc_threads_platform_pthreads_ThreadImpl.cpp
>@@ -0,0 +1,13 @@
>+--- xbmc/threads/platform/pthreads/ThreadImpl.cpp.orig	2014-12-22 23:11:35 UTC
>++++ xbmc/threads/platform/pthreads/ThreadImpl.cpp
>+@@ -31,9 +31,8 @@
>+ #include <sys/param.h>
>+ #if __FreeBSD_version < 900031
>+ #include <sys/thr.h>
>+-#else
>+-#include <pthread_np.h>
>+ #endif
>++#include <pthread_np.h>
>+ #endif
>+ 
>+ #include <signal.h>
>diff --git multimedia/kodi/pkg-descr multimedia/kodi/pkg-descr
>index ffd168d..5d594b6 100644
>--- multimedia/kodi/pkg-descr
>+++ multimedia/kodi/pkg-descr
>@@ -1,5 +1,6 @@
>-XBMC Media Center (formerly named "XBox Media Center")
>-is a free and open source cross-platform media-player
>-and entertainment hub.
>+Kodi (formerly known as XBMC) is a free and open source cross-platform
>+media-player and entertainment hub. It allows users to play and view
>+most videos, music, podcasts, and other digital media files from local
>+and network storage media and the internet.
> 
>-WWW: http://xbmc.org/
>+WWW: http://kodi.tv/
>diff --git multimedia/plexhometheater/Makefile multimedia/plexhometheater/Makefile
>index 673d4b2..2739381 100644
>--- multimedia/plexhometheater/Makefile
>+++ multimedia/plexhometheater/Makefile
>@@ -100,6 +100,7 @@ CEC_DESC=	Control plexhometheater over HDMI with TV remote
> 
> OPTIONS_DEFAULT=	CEC LIRC
> 
>+CEC_BUILD_DEPENDS=	libcec>=2.2.0:${PORTSDIR}/multimedia/libcec
> CEC_LIB_DEPENDS=	libcec.so:${PORTSDIR}/multimedia/libcec
> CEC_CMAKE_OFF=		-DCMAKE_DISABLE_FIND_PACKAGE_CEC:BOOL=true
> 
>diff --git multimedia/plexhometheater/files/patch-libcec22.patch multimedia/plexhometheater/files/patch-libcec22
>similarity index 98%
>rename from multimedia/plexhometheater/files/patch-libcec22.patch
>rename to multimedia/plexhometheater/files/patch-libcec22
>index 0885101..1473f9a 100644
>--- multimedia/plexhometheater/files/patch-libcec22.patch
>+++ multimedia/plexhometheater/files/patch-libcec22
>@@ -1,3 +1,5 @@
>+Origin: https://github.com/xbmc/xbmc/pull/5610
>+
> --- system/peripherals.xml.orig	2014-08-25 20:29:00.000000000 +0800
> +++ system/peripherals.xml	2014-12-31 07:15:34.972922137 +0800
> @@ -28,7 +28,7 @@

Actions: View | Diff

Attachments on bug 196299: 150989 | 150990 | 150991 | 151136 | 152008 | 152050 | 152246 | 153166