Attachment 162092 Details for Bug 203802 – multimedia_kaffeine.diff

[patch] multimedia_kaffeine.diff

multimedia_kaffeine.diff (text/plain), 8.04 KB, created by tkato432 on 2015-10-15 18:33:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-10-15 18:33:38 UTC

Size: 8.04 KB

patch

obsolete

>diff -urN /usr/ports/multimedia/kaffeine/Makefile multimedia/kaffeine/Makefile
>--- /usr/ports/multimedia/kaffeine/Makefile	2015-08-24 03:51:11.152639000 +0900
>+++ multimedia/kaffeine/Makefile	2015-10-16 00:00:00.000000000 +0900
>@@ -2,30 +2,26 @@
> # $FreeBSD: head/multimedia/kaffeine/Makefile 384633 2015-04-24 11:42:19Z robak $
> 
> PORTNAME=	kaffeine
>-PORTVERSION=	1.2.2
>-PORTREVISION=	8
>+PORTVERSION=	1.3.1
> CATEGORIES=	multimedia kde
> MASTER_SITES=	SF/kaffeine/current
> 
> MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	Xine-base multimedia player
>+COMMENT=	Multimedia player based on KDE and VLC
> 
>-BUILD_DEPENDS=	${LOCALBASE}/include/linux/dvb/ca.h:${PORTSDIR}/multimedia/v4l_compat
>-LIB_DEPENDS=	libxine.so:${PORTSDIR}/multimedia/libxine
>-
>-LICENSE=	GPLv2
>+LICENSE=	GPLv2 # (or later)
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USE_KDE4=	kdeprefix automoc4 kdelibs
>-USE_QT4=	corelib gui phonon svg network dbus xml sql \
>-		qmake_build moc_build rcc_build uic_build
>-USES=		cmake cpe gettext gmake
>-USE_LDCONFIG=		yes
>+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>
>diff -urN /usr/ports/multimedia/kaffeine/distinfo multimedia/kaffeine/distinfo
>--- /usr/ports/multimedia/kaffeine/distinfo	2015-08-24 03:51:11.072010000 +0900
>+++ multimedia/kaffeine/distinfo	2015-10-16 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (kaffeine-1.2.2.tar.gz) = b6476a93ddbf84142d4fe29f0757de871e11ce6ca32590affe863a75a231c8cb
>-SIZE (kaffeine-1.2.2.tar.gz) = 489727
>+SHA256 (kaffeine-1.3.1.tar.gz) = af3abe58e038478a0e50449d414c4885ff3e7a898724cf4216054a0360838aa6
>+SIZE (kaffeine-1.3.1.tar.gz) = 1011607
>diff -urN /usr/ports/multimedia/kaffeine/files/patch-clang multimedia/kaffeine/files/patch-clang
>--- /usr/ports/multimedia/kaffeine/files/patch-clang	2015-08-24 03:51:11.091137000 +0900
>+++ multimedia/kaffeine/files/patch-clang	1970-01-01 09:00:00.000000000 +0900
>@@ -1,24 +0,0 @@
>---- 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) &&
>diff -urN /usr/ports/multimedia/kaffeine/files/patch-dmx.h multimedia/kaffeine/files/patch-dmx.h
>--- /usr/ports/multimedia/kaffeine/files/patch-dmx.h	2015-08-24 03:51:11.116785000 +0900
>+++ multimedia/kaffeine/files/patch-dmx.h	2015-10-16 00:00:00.000000000 +0900
>@@ -1,5 +1,5 @@
>---- include/dmx.h.orig	2010-02-06 19:07:48.000000000 +0100
>-+++ include/dmx.h	2010-02-06 19:11:53.000000000 +0100
>+--- include/dmx.h.orig	2015-08-07 15:43:59 UTC
>++++ include/dmx.h
> @@ -24,7 +24,15 @@
>  #ifndef _DVBDMX_H_
>  #define _DVBDMX_H_
>diff -urN /usr/ports/multimedia/kaffeine/files/patch-frontend.h multimedia/kaffeine/files/patch-frontend.h
>--- /usr/ports/multimedia/kaffeine/files/patch-frontend.h	2015-08-24 03:51:11.091900000 +0900
>+++ multimedia/kaffeine/files/patch-frontend.h	2015-10-16 00:00:00.000000000 +0900
>@@ -1,5 +1,5 @@
>---- include/frontend.h.orig	2009-10-06 18:33:10.000000000 +0200
>-+++ include/frontend.h	2009-10-06 18:33:33.000000000 +0200
>+--- include/frontend.h.orig	2015-08-07 15:43:59 UTC
>++++ include/frontend.h
> @@ -26,7 +26,14 @@
>  #ifndef _DVBFRONTEND_H_
>  #define _DVBFRONTEND_H_
>diff -urN /usr/ports/multimedia/kaffeine/files/patch-src-dvb-dvbsi.h multimedia/kaffeine/files/patch-src-dvb-dvbsi.h
>--- /usr/ports/multimedia/kaffeine/files/patch-src-dvb-dvbsi.h	2015-08-24 03:51:11.115954000 +0900
>+++ multimedia/kaffeine/files/patch-src-dvb-dvbsi.h	2015-10-16 00:00:00.000000000 +0900
>@@ -1,6 +1,6 @@
>---- src/dvb/dvbsi.h.orig	2011-04-09 15:09:19.000000000 +0200
>-+++ src/dvb/dvbsi.h	2011-04-09 15:09:29.000000000 +0200
>-@@ -957,7 +957,6 @@
>+--- src/dvb/dvbsi.h.orig	2015-08-07 15:43:59 UTC
>++++ src/dvb/dvbsi.h
>+@@ -957,7 +957,6 @@ public:
>  		return DvbPmtSectionEntry(getData() + 12 + descriptorsLength, getLength() - (16 + descriptorsLength));
>  	}
>  
>diff -urN /usr/ports/multimedia/kaffeine/files/patch-src-mediawidget.cpp multimedia/kaffeine/files/patch-src-mediawidget.cpp
>--- /usr/ports/multimedia/kaffeine/files/patch-src-mediawidget.cpp	2015-08-24 03:51:11.092806000 +0900
>+++ multimedia/kaffeine/files/patch-src-mediawidget.cpp	2015-10-16 00:00:00.000000000 +0900
>@@ -1,5 +1,5 @@
>---- src/mediawidget.cpp.orig	2010-02-06 19:05:37.000000000 +0100
>-+++ src/mediawidget.cpp	2010-02-06 19:06:10.000000000 +0100
>+--- src/mediawidget.cpp.orig	2015-08-07 15:43:59 UTC
>++++ src/mediawidget.cpp
> @@ -18,6 +18,9 @@
>   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
>   */
>diff -urN /usr/ports/multimedia/kaffeine/pkg-descr multimedia/kaffeine/pkg-descr
>--- /usr/ports/multimedia/kaffeine/pkg-descr	2015-08-24 03:51:11.081074000 +0900
>+++ multimedia/kaffeine/pkg-descr	2015-10-16 00:00:00.000000000 +0900
>@@ -1,11 +1,10 @@
>-kaffeine is a xine-based multimedia player for KDE.
>+Kaffeine is a multimedia player based on KDE and VLC.
> 
> * Full Drag and Drop support
> * Import Noatun-playlists as well as M3U, ASX and PLS-Files
> * Editable Playlist
> * Export Playlist to HTML or PDF (KDE-Print)
>-* Edit Xine-Options via GUI
> * Support for saving screenshots as PNG, BMP or XBM
> * The ability to prevent the screensaver from activating OSD Titles
> 
>-WWW: http://kaffeine.sourceforge.net/
>+WWW: http://kaffeine.kde.org/
>diff -urN /usr/ports/multimedia/kaffeine/pkg-plist multimedia/kaffeine/pkg-plist
>--- /usr/ports/multimedia/kaffeine/pkg-plist	2015-08-24 03:51:11.140963000 +0900
>+++ multimedia/kaffeine/pkg-plist	2015-10-16 00:00:00.000000000 +0900
>@@ -1,16 +1,17 @@
>+bin/dtvdaemon
> bin/kaffeine
>-bin/kaffeine-xbu
>+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/32x32/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
>@@ -39,8 +40,8 @@
> 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

Actions: View | Diff

Attachments on bug 203802: 162092