Attachment #162092 for bug #203802

View | Details | Raw Unified | Return to bug 203802
Collapse All | Expand All




# $FreeBSD: head/multimedia/kaffeine/Makefile 384633 2015-04-24 11:42:19Z robak $

PORTNAME=	kaffeine
PORTVERSION=	1.3.1
PORTREVISION=	8
CATEGORIES=	multimedia kde
MASTER_SITES=	SF/kaffeine/current

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Multimedia player based on KDE and VLC

LICENSE=	GPLv2 # (or later)
LIB_DEPENDS=	libxine.so:${PORTSDIR}/multimedia/libxine

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat
LIB_DEPENDS=	libvlc.so:${PORTSDIR}/multimedia/vlc

USES=		cmake cpe gettext gmake pkgconfig
USE_KDE4=	automoc4 kdelibs kdeprefix
USE_QT4=	corelib dbus gui network phonon sql svg xml \
		moc_build qmake_build rcc_build uic_build
USE_XORG=	xscrnsaver

CPE_VENDOR=	kaffeine
CPE_PRODUCT=	kaffeine_player

post-patch:
	${REINPLACE_CMD} -e 's,add_subdirectory(x-test),,' ${WRKSRC}/po/CMakeLists.txt

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)multimedia/kaffeine/distinfo (-2 / +2 lines)
1	SHA256 (kaffeine-1.2.2.tar.gz) = b6476a93ddbf84142d4fe29f0757de871e11ce6ca32590affe863a75a231c8cb	1	SHA256 (kaffeine-1.3.1.tar.gz) = af3abe58e038478a0e50449d414c4885ff3e7a898724cf4216054a0360838aa6
2	SIZE (kaffeine-1.2.2.tar.gz) = 489727	2	SIZE (kaffeine-1.3.1.tar.gz) = 1011607




--- src/dvb/dvbepg.cpp.orig	2011-04-17 19:17:19.000000000 +0000
+++ src/dvb/dvbepg.cpp	2013-09-04 01:48:35.479500850 +0000
@@ -690,15 +690,15 @@
 	// 1980-01-06T000000 minus 15 secs (= UTC - GPS in 2011)
 	QDateTime baseDateTime = QDateTime(QDate(1980, 1, 5), QTime(23, 59, 45), Qt::UTC);
 
-	for (AtscEitSectionEntry entry = eitSection.entries(); (entryCount > 0) && entry.isValid();
-	     --entryCount, entry.advance()) {
+	for (AtscEitSectionEntry eitEntry = eitSection.entries();
+	     (entryCount > 0) && eitEntry.isValid(); --entryCount, eitEntry.advance()) {
 		DvbEpgEntry epgEntry;
 		epgEntry.channel = channel;
-		epgEntry.begin = baseDateTime.addSecs(entry.startTime());
-		epgEntry.duration = QTime().addSecs(entry.duration());
-		epgEntry.title = entry.title();
+		epgEntry.begin = baseDateTime.addSecs(eitEntry.startTime());
+		epgEntry.duration = QTime().addSecs(eitEntry.duration());
+		epgEntry.title = eitEntry.title();
 
-		quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(entry.eventId()));
+		quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(eitEntry.eventId()));
 		DvbSharedEpgEntry entry = epgEntries.value(id);
 
 		if (entry.isValid() && (entry->channel == epgEntry.channel) &&

Lines 1-5 Link Here

(-)multimedia/kaffeine/files/patch-dmx.h (-2 / +2 lines)
1	--- include/dmx.h.orig 2010-02-06 19:07:48.000000000 +0100	1	--- include/dmx.h.orig 2015-08-07 15:43:59 UTC
2	+++ include/dmx.h 2010-02-06 19:11:53.000000000 +0100	2	+++ include/dmx.h
3	@@ -24,7 +24,15 @@	3	@@ -24,7 +24,15 @@
4	#ifndef _DVBDMX_H_	4	#ifndef _DVBDMX_H_
5	#define _DVBDMX_H_	5	#define _DVBDMX_H_

Lines 1-5 Link Here

(-)multimedia/kaffeine/files/patch-frontend.h (-2 / +2 lines)
1	--- include/frontend.h.orig 2009-10-06 18:33:10.000000000 +0200	1	--- include/frontend.h.orig 2015-08-07 15:43:59 UTC
2	+++ include/frontend.h 2009-10-06 18:33:33.000000000 +0200	2	+++ include/frontend.h
3	@@ -26,7 +26,14 @@	3	@@ -26,7 +26,14 @@
4	#ifndef _DVBFRONTEND_H_	4	#ifndef _DVBFRONTEND_H_
5	#define _DVBFRONTEND_H_	5	#define _DVBFRONTEND_H_

Lines 1-6 Link Here

(-)multimedia/kaffeine/files/patch-src-dvb-dvbsi.h (-3 / +3 lines)
1	--- src/dvb/dvbsi.h.orig 2011-04-09 15:09:19.000000000 +0200	1	--- src/dvb/dvbsi.h.orig 2015-08-07 15:43:59 UTC
2	+++ src/dvb/dvbsi.h 2011-04-09 15:09:29.000000000 +0200	2	+++ src/dvb/dvbsi.h
3	@@ -957,7 +957,6 @@	3	@@ -957,7 +957,6 @@ public:
4	return DvbPmtSectionEntry(getData() + 12 + descriptorsLength, getLength() - (16 + descriptorsLength));	4	return DvbPmtSectionEntry(getData() + 12 + descriptorsLength, getLength() - (16 + descriptorsLength));
5	}	5	}
6		6

Lines 1-5 Link Here

(-)multimedia/kaffeine/files/patch-src-mediawidget.cpp (-2 / +2 lines)
1	--- src/mediawidget.cpp.orig 2010-02-06 19:05:37.000000000 +0100	1	--- src/mediawidget.cpp.orig 2015-08-07 15:43:59 UTC
2	+++ src/mediawidget.cpp 2010-02-06 19:06:10.000000000 +0100	2	+++ src/mediawidget.cpp
3	@@ -18,6 +18,9 @@	3	@@ -18,6 +18,9 @@
4	* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.	4	* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
5	*/	5	*/

Lines 1-11 Link Here

(-)multimedia/kaffeine/pkg-descr (-3 / +2 lines)
1	kaffeine is a xine-based multimedia player for KDE.	1	Kaffeine is a multimedia player based on KDE and VLC.
2		2
3	* Full Drag and Drop support	3	* Full Drag and Drop support
4	* Import Noatun-playlists as well as M3U, ASX and PLS-Files	4	* Import Noatun-playlists as well as M3U, ASX and PLS-Files
5	* Editable Playlist	5	* Editable Playlist
6	* Export Playlist to HTML or PDF (KDE-Print)	6	* Export Playlist to HTML or PDF (KDE-Print)
7	* Edit Xine-Options via GUI
8	* Support for saving screenshots as PNG, BMP or XBM	7	* Support for saving screenshots as PNG, BMP or XBM
9	* The ability to prevent the screensaver from activating OSD Titles	8	* The ability to prevent the screensaver from activating OSD Titles
10		9
11	WWW: http://kaffeine.sourceforge.net/	10	WWW: http://kaffeine.kde.org/




bin/dtvdaemon
bin/kaffeine
share/appdata/kaffeine.appdata.xml
share/applications/kde4/kaffeine.desktop
share/apps/kaffeine/scanfile.dvb
share/apps/profiles/kaffeine.profile.xml
share/apps/solid/actions/kaffeine_play_audiocd.desktop
share/apps/solid/actions/kaffeine_play_dvd.desktop
share/apps/solid/actions/kaffeine_play_videocd.desktop
share/icons/hicolor/48x48/apps/kaffeine.png
share/icons/hicolor/16x16/apps/kaffeine.png
share/icons/hicolor/128x128/apps/kaffeine.png
share/icons/hicolor/16x16/apps/kaffeine.png
share/icons/hicolor/22x22/apps/kaffeine.png
share/icons/hicolor/32x32/apps/kaffeine.png
share/icons/hicolor/48x48/apps/kaffeine.png
share/icons/hicolor/64x64/apps/kaffeine.png
share/icons/hicolor/scalable/apps/kaffeine.svgz
share/icons/oxygen/16x16/actions/audio-radio-encrypted.png

share/locale/fr/LC_MESSAGES/kaffeine.mo
share/locale/ga/LC_MESSAGES/kaffeine.mo
share/locale/gl/LC_MESSAGES/kaffeine.mo
share/locale/hu/LC_MESSAGES/kaffeine.mo
share/locale/hr/LC_MESSAGES/kaffeine.mo
share/locale/hu/LC_MESSAGES/kaffeine.mo
share/locale/it/LC_MESSAGES/kaffeine.mo
share/locale/ja/LC_MESSAGES/kaffeine.mo
share/locale/km/LC_MESSAGES/kaffeine.mo

Return to bug 203802

Lines 2-31 Link Here

(-)multimedia/kaffeine/Makefile (-15 / +11 lines)
2	# $FreeBSD: head/multimedia/kaffeine/Makefile 384633 2015-04-24 11:42:19Z robak $	2	# $FreeBSD: head/multimedia/kaffeine/Makefile 384633 2015-04-24 11:42:19Z robak $
3		3
4	PORTNAME= kaffeine	4	PORTNAME= kaffeine
5	PORTVERSION= 1.2.2	5	PORTVERSION= 1.3.1
6	PORTREVISION= 8
7	CATEGORIES= multimedia kde	6	CATEGORIES= multimedia kde
8	MASTER_SITES= SF/kaffeine/current	7	MASTER_SITES= SF/kaffeine/current
9		8
10	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
11	COMMENT= Xine-base multimedia player	10	COMMENT= Multimedia player based on KDE and VLC
12		11
13	BUILD_DEPENDS= ${LOCALBASE}/include/linux/dvb/ca.h:${PORTSDIR}/multimedia/v4l_compat	12	LICENSE= GPLv2 # (or later)
14	LIB_DEPENDS= libxine.so:${PORTSDIR}/multimedia/libxine
15
16	LICENSE= GPLv2
17	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
18		14
19	USE_KDE4= kdeprefix automoc4 kdelibs	15	BUILD_DEPENDS= v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat
20	USE_QT4= corelib gui phonon svg network dbus xml sql \	16	LIB_DEPENDS= libvlc.so:${PORTSDIR}/multimedia/vlc
21	qmake_build moc_build rcc_build uic_build	17
22	USES= cmake cpe gettext gmake	18	USES= cmake cpe gettext gmake pkgconfig
23	USE_LDCONFIG= yes	19	USE_KDE4= automoc4 kdelibs kdeprefix
		20	USE_QT4= corelib dbus gui network phonon sql svg xml \
		21	moc_build qmake_build rcc_build uic_build
24	USE_XORG= xscrnsaver	22	USE_XORG= xscrnsaver
		23
25	CPE_VENDOR= kaffeine	24	CPE_VENDOR= kaffeine
26	CPE_PRODUCT= kaffeine_player	25	CPE_PRODUCT= kaffeine_player
27		26
28	post-patch:
29	${REINPLACE_CMD} -e 's,add_subdirectory(x-test),,' ${WRKSRC}/po/CMakeLists.txt
30
31	.include <bsd.port.mk>	27	.include <bsd.port.mk>

Lines 1-24 Link Here

(-)multimedia/kaffeine/files/patch-clang (-24 lines)
1	--- src/dvb/dvbepg.cpp.orig 2011-04-17 19:17:19.000000000 +0000
2	+++ src/dvb/dvbepg.cpp 2013-09-04 01:48:35.479500850 +0000
3	@@ -690,15 +690,15 @@
4	// 1980-01-06T000000 minus 15 secs (= UTC - GPS in 2011)
5	QDateTime baseDateTime = QDateTime(QDate(1980, 1, 5), QTime(23, 59, 45), Qt::UTC);
6
7	- for (AtscEitSectionEntry entry = eitSection.entries(); (entryCount > 0) && entry.isValid();
8	- --entryCount, entry.advance()) {
9	+ for (AtscEitSectionEntry eitEntry = eitSection.entries();
10	+ (entryCount > 0) && eitEntry.isValid(); --entryCount, eitEntry.advance()) {
11	DvbEpgEntry epgEntry;
12	epgEntry.channel = channel;
13	- epgEntry.begin = baseDateTime.addSecs(entry.startTime());
14	- epgEntry.duration = QTime().addSecs(entry.duration());
15	- epgEntry.title = entry.title();
16	+ epgEntry.begin = baseDateTime.addSecs(eitEntry.startTime());
17	+ epgEntry.duration = QTime().addSecs(eitEntry.duration());
18	+ epgEntry.title = eitEntry.title();
19
20	- quint32 id = ((quint32(fakeChannel.networkId) << 16) \| quint32(entry.eventId()));
21	+ quint32 id = ((quint32(fakeChannel.networkId) << 16) \| quint32(eitEntry.eventId()));
22	DvbSharedEpgEntry entry = epgEntries.value(id);
23
24	if (entry.isValid() && (entry->channel == epgEntry.channel) &&

Lines 1-16 Link Here

(-)multimedia/kaffeine/pkg-plist (-5 / +6 lines)
		1	bin/dtvdaemon
1	bin/kaffeine	2	bin/kaffeine
2	bin/kaffeine-xbu	3	share/appdata/kaffeine.appdata.xml
3	share/applications/kde4/kaffeine.desktop	4	share/applications/kde4/kaffeine.desktop
4	share/apps/kaffeine/scanfile.dvb	5	share/apps/kaffeine/scanfile.dvb
5	share/apps/profiles/kaffeine.profile.xml	6	share/apps/profiles/kaffeine.profile.xml
6	share/apps/solid/actions/kaffeine_play_audiocd.desktop	7	share/apps/solid/actions/kaffeine_play_audiocd.desktop
7	share/apps/solid/actions/kaffeine_play_dvd.desktop	8	share/apps/solid/actions/kaffeine_play_dvd.desktop
8	share/apps/solid/actions/kaffeine_play_videocd.desktop	9	share/apps/solid/actions/kaffeine_play_videocd.desktop
9	share/icons/hicolor/48x48/apps/kaffeine.png
10	share/icons/hicolor/16x16/apps/kaffeine.png
11	share/icons/hicolor/128x128/apps/kaffeine.png	10	share/icons/hicolor/128x128/apps/kaffeine.png
12	share/icons/hicolor/32x32/apps/kaffeine.png	11	share/icons/hicolor/16x16/apps/kaffeine.png
13	share/icons/hicolor/22x22/apps/kaffeine.png	12	share/icons/hicolor/22x22/apps/kaffeine.png
		13	share/icons/hicolor/32x32/apps/kaffeine.png
		14	share/icons/hicolor/48x48/apps/kaffeine.png
14	share/icons/hicolor/64x64/apps/kaffeine.png	15	share/icons/hicolor/64x64/apps/kaffeine.png
15	share/icons/hicolor/scalable/apps/kaffeine.svgz	16	share/icons/hicolor/scalable/apps/kaffeine.svgz
16	share/icons/oxygen/16x16/actions/audio-radio-encrypted.png	17	share/icons/oxygen/16x16/actions/audio-radio-encrypted.png
Lines 39-46 Link Here
39	share/locale/fr/LC_MESSAGES/kaffeine.mo	40	share/locale/fr/LC_MESSAGES/kaffeine.mo
40	share/locale/ga/LC_MESSAGES/kaffeine.mo	41	share/locale/ga/LC_MESSAGES/kaffeine.mo
41	share/locale/gl/LC_MESSAGES/kaffeine.mo	42	share/locale/gl/LC_MESSAGES/kaffeine.mo
42	share/locale/hu/LC_MESSAGES/kaffeine.mo
43	share/locale/hr/LC_MESSAGES/kaffeine.mo	43	share/locale/hr/LC_MESSAGES/kaffeine.mo
		44	share/locale/hu/LC_MESSAGES/kaffeine.mo
44	share/locale/it/LC_MESSAGES/kaffeine.mo	45	share/locale/it/LC_MESSAGES/kaffeine.mo
45	share/locale/ja/LC_MESSAGES/kaffeine.mo	46	share/locale/ja/LC_MESSAGES/kaffeine.mo
46	share/locale/km/LC_MESSAGES/kaffeine.mo	47	share/locale/km/LC_MESSAGES/kaffeine.mo