6 files changed, 41 insertions, 166 deletions

diff --git a/multimedia/vdr/Makefile b/multimedia/vdr/Makefile
index 578df8da442a..250e5ac20a0a 100644
--- a/multimedia/vdr/Makefile
+++ b/multimedia/vdr/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	vdr
-PORTVERSION=	1.7.17
-PORTREVISION=	1
+PORTVERSION=	1.7.18
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.tvdr.de/vdr/Developer/
 
@@ -19,8 +18,7 @@ LIB_DEPENDS=    jpeg.11:${PORTSDIR}/graphics/jpeg
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig
 
-OPTIONS=	IPTVPATCH "Stops EIT scans on IPTV channels" On \
-		AC3PATCH "North America DVB-S AC3 audio workaround" Off
+OPTIONS=	IPTVPATCH "Stops EIT scans on IPTV channels" On
 
 DIST_SUBDIR=	vdr
 USE_BZIP2=	yes
@@ -57,9 +55,6 @@ PLIST_SUB+=	VDR_GROUP=${VDR_GROUP}
 EXTRA_PATCHES+=	${FILESDIR}/vdr-1.7.15-disable_ca_updates.patch \
 	${FILESDIR}/vdr-1.7.15-disable_eitscan.patch
 .endif
-.if defined(WITH_AC3PATCH)
-EXTRA_PATCHES+=	${FILESDIR}/vdr-1.7.17-fix_na_dvbs_ac3.diff
-.endif
 
 .if !defined(WITHOUT_NLS)
 PLIST_SUB+=	NLS=""
@@ -72,6 +67,8 @@ post-patch:
 	@${SED} 's|^\(VIDEODIR[[:space:]]*\)[?]*\(=[[:space:]]*\).*|\1\2${VIDEODIR}|' \
 		${WRKSRC}/Make.config.template >${WRKSRC}/Make.config
 	@${REINPLACE_CMD} -e 's|%%CONFDIR%%|${CONFDIR}|' ${WRKSRC}/vdr.1
+# We don't support this yet:
+	@${RM} -r ${WRKSRC}/PLUGINS/src/dvbhddevice
 
 post-install:
 .if !defined(WITHOUT_NLS)
diff --git a/multimedia/vdr/distinfo b/multimedia/vdr/distinfo
index bd9710b6b034..7a5a420d8c52 100644
--- a/multimedia/vdr/distinfo
+++ b/multimedia/vdr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vdr/vdr-1.7.17.tar.bz2) = f11102d4b4595347587f09f3957d508567cead6ccd231f9831fc02be8deb7994
-SIZE (vdr/vdr-1.7.17.tar.bz2) = 688181
+SHA256 (vdr/vdr-1.7.18.tar.bz2) = 503168921cbcae21687fc4d686c56c2f0b1cbdc578fb053b4a18eee8e5002705
+SIZE (vdr/vdr-1.7.18.tar.bz2) = 712601
diff --git a/multimedia/vdr/files/patch-tools.c-indexregenfix b/multimedia/vdr/files/patch-tools.c-indexregenfix
index c5590f141e4b..e69de29bb2d1 100644
--- a/multimedia/vdr/files/patch-tools.c-indexregenfix
+++ b/multimedia/vdr/files/patch-tools.c-indexregenfix
@@ -1,12 +0,0 @@
---- tools.c.orig
-+++ tools.c
-@@ -1669,6 +1669,9 @@ ssize_t cUnbufferedFile::Read(void *Data
-            }
-         }
-      lastpos = curpos;
-+#else
-+     if (bytesRead > 0)
-+        curpos += bytesRead;
- #endif
-      return bytesRead;
-      }
diff --git a/multimedia/vdr/files/patch-vdr-1.7.17_FreeBSD b/multimedia/vdr/files/patch-vdr-1.7.18_FreeBSD
index 3b3943b745e9..3bae564bbdda 100644
--- a/multimedia/vdr/files/patch-vdr-1.7.17_FreeBSD
+++ b/multimedia/vdr/files/patch-vdr-1.7.18_FreeBSD
@@ -81,20 +81,19 @@ Index: Makefile
  CC       ?= gcc
  CFLAGS   ?= -g -O3 -Wall
  
-@@ -20,7 +25,12 @@ PREFIX  ?= /usr/local
- MANDIR   = $(PREFIX)/share/man
+@@ -21,7 +26,11 @@ MANDIR   = $(PREFIX)/share/man
  BINDIR   = $(PREFIX)/bin
+ INCDIR   = $(PREFIX)/include
  LOCDIR   = ./locale
 +ifdef FREEBSD
-+LIBDIRS  = -L${LOCALBASE}/lib
-+LIBS     = -ljpeg -lpthread -lrt -lfreetype -lfontconfig -liconv -lintl
++LIBS     = -ljpeg -lpthread -lrt $(shell pkg-config --libs freetype2 fontconfig) -liconv -lintl
 +else
- LIBS     = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig
+ LIBS     = -ljpeg -lpthread -ldl -lcap -lrt $(shell pkg-config --libs freetype2 fontconfig)
 +endif
- INCLUDES ?= $(shell pkg-config --cflags freetype2)
+ INCLUDES ?= $(shell pkg-config --cflags freetype2 fontconfig)
  
  PLUGINDIR= ./PLUGINS
-@@ -129,7 +139,11 @@ i18n: $(I18Nmsgs)
+@@ -130,7 +139,11 @@ i18n: $(I18Nmsgs)
  
  install-i18n:
  	@mkdir -p $(DESTDIR)$(LOCDIR)
@@ -106,7 +105,7 @@ Index: Makefile
  
  # The 'include' directory (for plugins):
  
-@@ -168,7 +182,11 @@ install: install-bin install-conf instal
+@@ -169,7 +182,11 @@ install: install-bin install-conf instal
  
  install-bin: vdr
  	@mkdir -p $(DESTDIR)$(BINDIR)
@@ -118,7 +117,7 @@ Index: Makefile
  
  # Configuration files:
  
-@@ -191,7 +209,11 @@ install-doc:
+@@ -192,13 +209,18 @@ install-doc:
  
  install-plugins: plugins
  	@mkdir -p $(DESTDIR)$(PLUGINLIBDIR)
@@ -128,6 +127,13 @@ Index: Makefile
  	@cp --remove-destination $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(DESTDIR)$(PLUGINLIBDIR)
 +endif
  
+ # Includes:
+ 
+ install-includes: include-dir
+ 	@mkdir -p $(DESTDIR)$(INCDIR)
+ 	@cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++	@cp Make.config Make.global $(DESTDIR)$(INCDIR)/vdr
+ 
  # Source documentation:
  
 Index: channels.c
@@ -230,62 +236,6 @@ diff -u -r1.1.1.3 -r1.4
    if (fields == 4)
       commands = NULL; //XXX Apparently sscanf() doesn't work correctly if the last %a argument results in an empty string
    if (4 <= fields && fields <= 5) {
-Index: dvbsubtitle.c
-===================================================================
-RCS file: /progs/network/ccvs/vdr/dvbsubtitle.c,v
-retrieving revision 1.1.1.5
-retrieving revision 1.5
-diff -u -r1.1.1.5 -r1.5
---- dvbsubtitle.c	2010/10/19 20:28:49	1.1.1.5
-+++ dvbsubtitle.c	2010/10/19 20:32:58	1.5
-@@ -718,7 +718,11 @@
-      if (Length > PayloadOffset + SubstreamHeaderLength) {
-         int64_t pts = PesHasPts(Data) ? PesGetPts(Data) : 0;
-         if (pts)
-+#ifdef __FreeBSD__
-+           dbgconverter("Converter PTS: %lld\n", (long long int)pts);
-+#else
-            dbgconverter("Converter PTS: %lld\n", pts);
-+#endif
-         const uchar *data = Data + PayloadOffset + SubstreamHeaderLength; // skip substream header
-         int length = Length - PayloadOffset - SubstreamHeaderLength; // skip substream header
-         if (ResetSubtitleAssembler)
-@@ -754,7 +758,11 @@
-      if (Length > PayloadOffset) {
-         int64_t pts = PesGetPts(Data);
-         if (pts)
-+#ifdef __FreeBSD__
-+           dbgconverter("Converter PTS: %lld\n", (long long int)pts);
-+#else
-            dbgconverter("Converter PTS: %lld\n", pts);
-+#endif
-         const uchar *data = Data + PayloadOffset;
-         int length = Length - PayloadOffset;
-         if (length > 3) {
-@@ -819,7 +827,11 @@
-                     if (AssertOsd()) {
-                        sb->Draw(osd);
-                        Timeout.Set(sb->Timeout() * 1000);
-+#ifdef __FreeBSD__
-+                       dbgconverter("PTS: %lld  STC: %lld (%lld) timeout: %d\n", (long long int)sb->Pts(), (long long int)cDevice::PrimaryDevice()->GetSTC(), (long long int)Delta, sb->Timeout());
-+#else
-                        dbgconverter("PTS: %lld  STC: %lld (%lld) timeout: %d\n", sb->Pts(), cDevice::PrimaryDevice()->GetSTC(), Delta, sb->Timeout());
-+#endif
-                        }
-                     bitmaps->Del(sb);
-                     }
-@@ -889,7 +901,11 @@
-             page->SetTimeout(Data[6]);
-             page->SetState((Data[6 + 1] & 0x0C) >> 2);
-             page->regions.Clear();
-+#ifdef __FreeBSD__
-+            dbgpages("Update page id %d version %d pts %lld timeout %d state %d\n", pageId, page->Version(), (long long int)page->Pts(), page->Timeout(), page->State());
-+#else
-             dbgpages("Update page id %d version %d pts %lld timeout %d state %d\n", pageId, page->Version(), page->Pts(), page->Timeout(), page->State());
-+#endif
-             for (int i = 6 + 2; i < segmentLength; i += 6) {
-                 cSubtitleRegion *region = page->GetRegionById(Data[i], true);
-                 region->SetHorizontalAddress((Data[i + 2] << 8) + Data[i + 3]);
 Index: eit.c
 ===================================================================
 RCS file: /progs/network/ccvs/vdr/eit.c,v
@@ -426,18 +376,6 @@ retrieving revision 1.5
 diff -u -r1.1.1.3 -r1.5
 --- recording.c	2010/03/16 15:18:58	1.1.1.3
 +++ recording.c	2010/03/16 15:21:05	1.5
-@@ -1505,7 +1505,11 @@
-               delta = int(buf.st_size % sizeof(tIndexTs));
-               if (delta) {
-                  delta = sizeof(tIndexTs) - delta;
-+#ifdef __FreeBSD__
-+                 esyslog("ERROR: invalid file size (%lld) in '%s'", (long long int)buf.st_size, fileName);
-+#else
-                  esyslog("ERROR: invalid file size (%lld) in '%s'", buf.st_size, fileName);
-+#endif
-                  }
-               last = int((buf.st_size + delta) / sizeof(tIndexTs) - 1);
-               if (!Record && last >= 0) {
 @@ -1825,7 +1829,11 @@
           // Search for a PAT packet from the end of the file:
           cPatPmtParser PatPmtParser;
@@ -473,32 +411,6 @@ diff -u -r1.1.1.3 -r1.5
             if (!file)
                LOG_ERROR_STR(fileName);
             }
-Index: remote.c
-===================================================================
-RCS file: /progs/network/ccvs/vdr/remote.c,v
-retrieving revision 1.1.1.2
-retrieving revision 1.2
-diff -u -r1.1.1.2 -r1.2
---- remote.c	2010/02/17 10:14:45	1.1.1.2
-+++ remote.c	2010/02/17 12:36:01	1.2
-@@ -121,7 +121,11 @@
- bool cRemote::Put(uint64_t Code, bool Repeat, bool Release)
- {
-   char buffer[32];
-+#ifdef __FreeBSD__
-+  snprintf(buffer, sizeof(buffer), "%016llX", (long long unsigned int)Code);
-+#else
-   snprintf(buffer, sizeof(buffer), "%016llX", Code);
-+#endif
-   return Put(buffer, Repeat, Release);
- }
- 
-Index: shutdown.c
-===================================================================
-RCS file: /progs/network/ccvs/vdr/shutdown.c,v
-retrieving revision 1.1.1.2
-retrieving revision 1.4
-diff -u -r1.1.1.2 -r1.4
 Index: skins.c
 ===================================================================
 RCS file: /progs/network/ccvs/vdr/skins.c,v
diff --git a/multimedia/vdr/files/patch-z-Makefile b/multimedia/vdr/files/patch-z-Makefile
index 60b41fde1ed6..d8da405753a1 100644
--- a/multimedia/vdr/files/patch-z-Makefile
+++ b/multimedia/vdr/files/patch-z-Makefile
@@ -1,22 +1,14 @@
 Index: Makefile
-@@ -25,6 +25,7 @@ PREFIX  ?= /usr/local
- MANDIR   = $(PREFIX)/share/man
- BINDIR   = $(PREFIX)/bin
- LOCDIR   = ./locale
-+INCDIR   = $(PREFIX)/include
- ifdef FREEBSD
- INCLUDES = -I/usr/local/include/freetype2
- LIBDIRS  = -L/usr/local/lib
-@@ -177,7 +178,7 @@ clean-plugins:
+@@ -176,7 +176,7 @@ clean-plugins:
  
  # Install the files:
  
--install: install-bin install-conf install-doc install-plugins install-i18n
-+install: install-bin install-doc install-plugins install-header
+-install: install-bin install-conf install-doc install-plugins install-i18n install-includes
++install: install-bin install-doc install-plugins install-includes
  
  # VDR binary:
  
-@@ -192,7 +193,6 @@ endif
+@@ -191,7 +191,6 @@ endif
  # Configuration files:
  
  install-conf:
@@ -24,7 +16,7 @@ Index: Makefile
  	@if [ ! -d $(DESTDIR)$(CONFDIR) ]; then\
  	    mkdir -p $(DESTDIR)$(CONFDIR);\
  	    cp *.conf $(DESTDIR)$(CONFDIR);\
-@@ -208,7 +208,7 @@ install-doc:
+@@ -207,7 +206,7 @@ install-doc:
  
  # Plugins:
  
@@ -33,17 +25,3 @@ Index: Makefile
  	@mkdir -p $(DESTDIR)$(PLUGINLIBDIR)
  ifdef FREEBSD
  	@cp -f $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(DESTDIR)$(PLUGINLIBDIR)
-@@ -216,6 +216,13 @@ else
- 	@cp --remove-destination $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(DESTDIR)$(PLUGINLIBDIR)
- endif
- 
-+# Header files:
-+
-+install-header:
-+	@mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
-+	@cp *.h Make.config Make.global $(DESTDIR)$(INCDIR)/vdr
-+	@cp libsi/*.h $(DESTDIR)$(INCDIR)/vdr/libsi
-+
- # Source documentation:
- 
- srcdoc:
diff --git a/multimedia/vdr/pkg-plist b/multimedia/vdr/pkg-plist
index 9fedb1c62c55..d2bd13017f6c 100644
--- a/multimedia/vdr/pkg-plist
+++ b/multimedia/vdr/pkg-plist
@@ -1,14 +1,14 @@
 bin/svdrpsend.pl
 bin/vdr
-lib/vdr/libvdr-dvbsddevice.so.1.7.17
-lib/vdr/libvdr-svcsvr.so.1.7.17
-lib/vdr/libvdr-svccli.so.1.7.17
-lib/vdr/libvdr-status.so.1.7.17
-lib/vdr/libvdr-skincurses.so.1.7.17
-lib/vdr/libvdr-pictures.so.1.7.17
-lib/vdr/libvdr-osddemo.so.1.7.17
-lib/vdr/libvdr-hello.so.1.7.17
-lib/vdr/libvdr-svdrpdemo.so.1.7.17
+lib/vdr/libvdr-dvbsddevice.so.1.7.18
+lib/vdr/libvdr-svcsvr.so.1.7.18
+lib/vdr/libvdr-svccli.so.1.7.18
+lib/vdr/libvdr-status.so.1.7.18
+lib/vdr/libvdr-skincurses.so.1.7.18
+lib/vdr/libvdr-pictures.so.1.7.18
+lib/vdr/libvdr-osddemo.so.1.7.18
+lib/vdr/libvdr-hello.so.1.7.18
+lib/vdr/libvdr-svdrpdemo.so.1.7.18
 %%NLS%%share/locale/ar/LC_MESSAGES/vdr.mo
 %%NLS%%share/locale/es_ES/LC_MESSAGES/vdr.mo
 %%NLS%%share/locale/es_ES/LC_MESSAGES/vdr-hello.mo
@@ -74,11 +74,11 @@ lib/vdr/libvdr-svdrpdemo.so.1.7.17
 %%NLS%%share/locale/cs_CZ/LC_MESSAGES/vdr-hello.mo
 %%NLS%%share/locale/ca_ES/LC_MESSAGES/vdr.mo
 %%NLS%%share/locale/ca_ES/LC_MESSAGES/vdr-hello.mo
-include/vdr/libsi/util.h
-include/vdr/libsi/si.h
-include/vdr/libsi/section.h
-include/vdr/libsi/headers.h
-include/vdr/libsi/descriptor.h
+include/libsi/util.h
+include/libsi/si.h
+include/libsi/section.h
+include/libsi/headers.h
+include/libsi/descriptor.h
 include/vdr/audio.h
 include/vdr/Make.config
 include/vdr/videodir.h
@@ -203,6 +203,6 @@ etc/vdr/svdrphosts.conf.sample
 @dirrmtry etc/vdr/plugins
 @dirrmtry etc/vdr
 @dirrmtry lib/vdr
-@dirrm include/vdr/libsi
+@dirrm include/libsi
 @dirrm include/vdr
 @unexec echo "Warning: If you will *NOT* use this package anymore, please remove the vdr user and group manually."