From owner-svn-ports-head@freebsd.org Fri Apr 17 08:36:01 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3B3722AF841; Fri, 17 Apr 2020 08:36:01 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 493TvP08YHz4mx6; Fri, 17 Apr 2020 08:36:01 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 008141F7D3; Fri, 17 Apr 2020 08:36:01 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03H8a04f060691; Fri, 17 Apr 2020 08:36:00 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03H8Zxv2060679; Fri, 17 Apr 2020 08:35:59 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202004170835.03H8Zxv2060679@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 17 Apr 2020 08:35:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r531912 - in head/multimedia: kaffeine mythtv mythtv/files w_scan w_scan/files X-SVN-Group: ports-head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: in head/multimedia: kaffeine mythtv mythtv/files w_scan w_scan/files X-SVN-Commit-Revision: 531912 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Apr 2020 08:36:01 -0000 Author: hselasky Date: Fri Apr 17 08:35:59 2020 New Revision: 531912 URL: https://svnweb.freebsd.org/changeset/ports/531912 Log: Fix build after LibV4L upgrade to v1.18.0. PR: 245501 Approved by: pi (implicit) Added: head/multimedia/w_scan/files/patch-si__types.h (contents, props changed) Deleted: head/multimedia/w_scan/files/types.sed Modified: head/multimedia/kaffeine/Makefile head/multimedia/mythtv/Makefile head/multimedia/mythtv/files/patch-libs_libmythtv_videodev2.h head/multimedia/w_scan/Makefile Modified: head/multimedia/kaffeine/Makefile ============================================================================== --- head/multimedia/kaffeine/Makefile Fri Apr 17 08:34:50 2020 (r531911) +++ head/multimedia/kaffeine/Makefile Fri Apr 17 08:35:59 2020 (r531912) @@ -3,7 +3,7 @@ PORTNAME= kaffeine DISTVERSION= 2.0.18 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia kde MASTER_SITES= KDE/stable/${PORTNAME} @@ -13,7 +13,7 @@ COMMENT= Multimedia player based on KDE and VLC LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat +BUILD_DEPENDS= v4l_compat>=1.18.0:multimedia/v4l_compat LIB_DEPENDS= libvlc.so:multimedia/vlc \ libdvbv5.so:multimedia/libv4l @@ -28,6 +28,9 @@ USE_XORG= xscrnsaver CPE_VENDOR= kaffeine CPE_PRODUCT= kaffeine_player + +post-patch: + @${RM} -r ${WRKSRC}/include post-build: # Cleanup translated manpages, we don't want them Modified: head/multimedia/mythtv/Makefile ============================================================================== --- head/multimedia/mythtv/Makefile Fri Apr 17 08:34:50 2020 (r531911) +++ head/multimedia/mythtv/Makefile Fri Apr 17 08:35:59 2020 (r531912) @@ -4,7 +4,7 @@ PORTNAME= mythtv DISTVERSIONPREFIX= v DISTVERSION= 30.0 -PORTREVISION?= 4 +PORTREVISION?= 5 PORTEPOCH= 1 CATEGORIES= multimedia @@ -83,7 +83,7 @@ OPTIONS_EXCLUDE+= BINDINGS LIRC MYSQL .else CONFLICTS_INSTALL= mythtv-frontend -BUILD_DEPENDS+= v4l_compat>=1.0.20100321:multimedia/v4l_compat +BUILD_DEPENDS+= v4l_compat>=1.18.0:multimedia/v4l_compat RUN_DEPENDS+= tv_check:textproc/p5-xmltv \ wget:ftp/wget USES+= perl5 python:2.7 shebangfix Modified: head/multimedia/mythtv/files/patch-libs_libmythtv_videodev2.h ============================================================================== --- head/multimedia/mythtv/files/patch-libs_libmythtv_videodev2.h Fri Apr 17 08:34:50 2020 (r531911) +++ head/multimedia/mythtv/files/patch-libs_libmythtv_videodev2.h Fri Apr 17 08:35:59 2020 (r531912) @@ -1,34 +1,32 @@ ---- libs/libmythtv/videodev2.h.orig 2018-01-11 12:39:22 UTC +--- libs/libmythtv/videodev2.h.orig 2019-01-14 11:53:51 UTC +++ libs/libmythtv/videodev2.h -@@ -60,6 +60,32 @@ - #ifdef __FreeBSD__ - #include // For __[us][0-9]+ types -+#ifndef __u64 -+typedef uint64_t __u64; -+#endif -+#ifndef __u32 -+typedef uint32_t __u32; -+#endif -+#ifndef __u16 -+typedef uint16_t __u16; -+#endif -+#ifndef __u8 -+typedef uint8_t __u8; -+#endif +@@ -53,25 +53,14 @@ + * Hans Verkuil + * et al. + */ +-#ifndef __LINUX_VIDEODEV2_H + -+#ifndef __s64 -+typedef int64_t __s64; -+#endif -+#ifndef __s32 -+typedef int32_t __s32; -+#endif -+#ifndef __s16 -+typedef int16_t __s16; -+#endif -+#ifndef __s8 -+typedef int8_t __s8; -+#endif -+ - #define __le64 __u64 - #define __le32 __u32 - #define __le16 __u16 ++#ifdef __FreeBSD__ ++#include ++#elif !defined(__LINUX_VIDEODEV2_H) + #define __LINUX_VIDEODEV2_H + + #include + +-#ifdef __FreeBSD__ +-#include // For __[us][0-9]+ types +-#define __le64 __u64 +-#define __le32 __u32 +-#define __le16 __u16 +-#define __le8 __u8 +-#define __be64 __u64 +-#define __be32 __u32 +-#define __be16 __u16 +-#define __be8 __u8 +-#else +-#include +-#include +-#endif + #include + #include + Modified: head/multimedia/w_scan/Makefile ============================================================================== --- head/multimedia/w_scan/Makefile Fri Apr 17 08:34:50 2020 (r531911) +++ head/multimedia/w_scan/Makefile Fri Apr 17 08:35:59 2020 (r531912) @@ -3,7 +3,7 @@ PORTNAME= w_scan PORTVERSION= 20170107 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://wirbel.htpc-forum.de/w_scan/ @@ -25,9 +25,6 @@ PLIST_FILES= bin/${PORTNAME} \ man/man1/${PORTNAME}.1.gz OPTIONS_DEFINE= DOCS - -post-patch: - @${REINPLACE_CMD} -f ${FILESDIR}/types.sed ${WRKSRC}/configure ${WRKSRC}/*.c ${WRKSRC}/*.h post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} Added: head/multimedia/w_scan/files/patch-si__types.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/w_scan/files/patch-si__types.h Fri Apr 17 08:35:59 2020 (r531912) @@ -0,0 +1,10 @@ +--- si_types.h.orig 2020-04-14 20:31:04 UTC ++++ si_types.h +@@ -27,6 +27,7 @@ + #define __SI_TYPES_H + + #include ++#include + #include "descriptors.h" + #include "tools.h" +