Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 29 Oct 2015 19:28:34 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r400475 - in head/multimedia/kaffeine: . files
Message-ID:  <201510291928.t9TJSY1H010574@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Thu Oct 29 19:28:33 2015
New Revision: 400475
URL: https://svnweb.freebsd.org/changeset/ports/400475

Log:
  - Update to version 1.3.1, now KDE and VLC based
  - Regenerate patches
  - Update homepage in pkg-descr
  
  PR:		203802
  Submitted by:	tkato432@yahoo.com

Deleted:
  head/multimedia/kaffeine/files/patch-clang
Modified:
  head/multimedia/kaffeine/Makefile
  head/multimedia/kaffeine/distinfo
  head/multimedia/kaffeine/files/patch-dmx.h
  head/multimedia/kaffeine/files/patch-frontend.h
  head/multimedia/kaffeine/files/patch-src-dvb-dvbsi.h
  head/multimedia/kaffeine/files/patch-src-mediawidget.cpp
  head/multimedia/kaffeine/pkg-descr
  head/multimedia/kaffeine/pkg-plist

Modified: head/multimedia/kaffeine/Makefile
==============================================================================
--- head/multimedia/kaffeine/Makefile	Thu Oct 29 17:24:00 2015	(r400474)
+++ head/multimedia/kaffeine/Makefile	Thu Oct 29 19:28:33 2015	(r400475)
@@ -2,30 +2,26 @@
 # $FreeBSD$
 
 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>

Modified: head/multimedia/kaffeine/distinfo
==============================================================================
--- head/multimedia/kaffeine/distinfo	Thu Oct 29 17:24:00 2015	(r400474)
+++ head/multimedia/kaffeine/distinfo	Thu Oct 29 19:28:33 2015	(r400475)
@@ -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

Modified: head/multimedia/kaffeine/files/patch-dmx.h
==============================================================================
--- head/multimedia/kaffeine/files/patch-dmx.h	Thu Oct 29 17:24:00 2015	(r400474)
+++ head/multimedia/kaffeine/files/patch-dmx.h	Thu Oct 29 19:28:33 2015	(r400475)
@@ -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_

Modified: head/multimedia/kaffeine/files/patch-frontend.h
==============================================================================
--- head/multimedia/kaffeine/files/patch-frontend.h	Thu Oct 29 17:24:00 2015	(r400474)
+++ head/multimedia/kaffeine/files/patch-frontend.h	Thu Oct 29 19:28:33 2015	(r400475)
@@ -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_

Modified: head/multimedia/kaffeine/files/patch-src-dvb-dvbsi.h
==============================================================================
--- head/multimedia/kaffeine/files/patch-src-dvb-dvbsi.h	Thu Oct 29 17:24:00 2015	(r400474)
+++ head/multimedia/kaffeine/files/patch-src-dvb-dvbsi.h	Thu Oct 29 19:28:33 2015	(r400475)
@@ -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));
  	}
  

Modified: head/multimedia/kaffeine/files/patch-src-mediawidget.cpp
==============================================================================
--- head/multimedia/kaffeine/files/patch-src-mediawidget.cpp	Thu Oct 29 17:24:00 2015	(r400474)
+++ head/multimedia/kaffeine/files/patch-src-mediawidget.cpp	Thu Oct 29 19:28:33 2015	(r400475)
@@ -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.
   */

Modified: head/multimedia/kaffeine/pkg-descr
==============================================================================
--- head/multimedia/kaffeine/pkg-descr	Thu Oct 29 17:24:00 2015	(r400474)
+++ head/multimedia/kaffeine/pkg-descr	Thu Oct 29 19:28:33 2015	(r400475)
@@ -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/

Modified: head/multimedia/kaffeine/pkg-plist
==============================================================================
--- head/multimedia/kaffeine/pkg-plist	Thu Oct 29 17:24:00 2015	(r400474)
+++ head/multimedia/kaffeine/pkg-plist	Thu Oct 29 19:28:33 2015	(r400475)
@@ -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/fi/LC_MESSAGES/kaffeine.mo
 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510291928.t9TJSY1H010574>