svn commit: r414596 - in head/multimedia/kaffeine: . files

[Tilman Keskinoz]

Author: arved
Date: Wed May  4 09:23:19 2016
New Revision: 414596
URL: https://svnweb.freebsd.org/changeset/ports/414596

Log:
  Fix DVB support
  
  PR:		208097
  Reported by:	Stefan Rumetshofer
  
  Grab back maintainership

Added:
  head/multimedia/kaffeine/files/patch-dvbdevice_linux.cpp   (contents, props changed)
Modified:
  head/multimedia/kaffeine/Makefile
  head/multimedia/kaffeine/files/patch-dmx.h
  head/multimedia/kaffeine/files/patch-frontend.h

Modified: head/multimedia/kaffeine/Makefile
==============================================================================
--- head/multimedia/kaffeine/Makefile	Wed May  4 09:17:34 2016	(r414595)
+++ head/multimedia/kaffeine/Makefile	Wed May  4 09:23:19 2016	(r414596)
@@ -3,11 +3,11 @@
 
 PORTNAME=	kaffeine
 PORTVERSION=	1.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia kde
 MASTER_SITES=	SF/kaffeine/current
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	arved at FreeBSD.org
 COMMENT=	Multimedia player based on KDE and VLC
 
 LICENSE=	GPLv2+

Modified: head/multimedia/kaffeine/files/patch-dmx.h
==============================================================================
--- head/multimedia/kaffeine/files/patch-dmx.h	Wed May  4 09:17:34 2016	(r414595)
+++ head/multimedia/kaffeine/files/patch-dmx.h	Wed May  4 09:23:19 2016	(r414596)
@@ -1,6 +1,6 @@
 --- include/dmx.h.orig	2015-08-07 15:43:59 UTC
 +++ include/dmx.h
-@@ -24,7 +24,15 @@
+@@ -24,7 +24,16 @@
  #ifndef _DVBDMX_H_
  #define _DVBDMX_H_
  
@@ -12,6 +12,7 @@
 +typedef uint32_t __u32;
 +typedef uint16_t __u16;
 +typedef uint8_t __u8;
++typedef int64_t __s64;
 +#endif
 +
  #include <time.h>

Added: head/multimedia/kaffeine/files/patch-dvbdevice_linux.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/kaffeine/files/patch-dvbdevice_linux.cpp	Wed May  4 09:23:19 2016	(r414596)
@@ -0,0 +1,23 @@
+--- src/dvb/dvbdevice_linux.cpp.orig	2016-05-03 12:36:58.011789000 +0200
++++ src/dvb/dvbdevice_linux.cpp	2016-05-03 12:41:02.658341000 +0200
+@@ -35,7 +35,9 @@
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+ #include <dirent.h>
++#ifndef __FreeBSD__
+ #include <sys/inotify.h>
++#endif
+ #include <vector>
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -854,8 +856,10 @@
+ 
+                 runstate = 1;
+ 
++#ifndef __FreeBSD__
+                 ifd = inotify_init();
+                 inotify_add_watch(ifd, "/dev/dvb", IN_CREATE|IN_DELETE);
++#endif
+                 fcntl(ifd, F_SETFL, O_NONBLOCK);
+                 pfd.fd = ifd;
+                 pfd.events = POLLIN;

Modified: head/multimedia/kaffeine/files/patch-frontend.h
==============================================================================
--- head/multimedia/kaffeine/files/patch-frontend.h	Wed May  4 09:17:34 2016	(r414595)
+++ head/multimedia/kaffeine/files/patch-frontend.h	Wed May  4 09:23:19 2016	(r414596)
@@ -1,6 +1,6 @@
 --- include/frontend.h.orig	2015-08-07 15:43:59 UTC
 +++ include/frontend.h
-@@ -26,7 +26,14 @@
+@@ -26,7 +26,15 @@
  #ifndef _DVBFRONTEND_H_
  #define _DVBFRONTEND_H_
  
@@ -12,6 +12,7 @@
 +typedef uint32_t __u32;
 +typedef uint16_t __u16;
 +typedef uint8_t __u8;
++typedef int64_t __s64;
 +#endif
  
  typedef enum fe_type {