From owner-svn-ports-branches@freebsd.org Mon Oct 31 18:17:44 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3344BC16E20; Mon, 31 Oct 2016 18:17:44 +0000 (UTC) (envelope-from feld@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 mx1.freebsd.org (Postfix) with ESMTPS id 036611203; Mon, 31 Oct 2016 18:17:43 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9VIHh3Y015521; Mon, 31 Oct 2016 18:17:43 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9VIHh0l015520; Mon, 31 Oct 2016 18:17:43 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201610311817.u9VIHh0l015520@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Mon, 31 Oct 2016 18:17:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425021 - branches/2016Q4/net/vnstat X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Oct 2016 18:17:44 -0000 Author: feld Date: Mon Oct 31 18:17:42 2016 New Revision: 425021 URL: https://svnweb.freebsd.org/changeset/ports/425021 Log: MFH: r425020 Remove legacy PORTSDIR Approved by: ports-secteam (with hat) Modified: branches/2016Q4/net/vnstat/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/net/vnstat/Makefile ============================================================================== --- branches/2016Q4/net/vnstat/Makefile Mon Oct 31 18:17:08 2016 (r425020) +++ branches/2016Q4/net/vnstat/Makefile Mon Oct 31 18:17:42 2016 (r425021) @@ -33,7 +33,7 @@ OPTIONS_DEFAULT= GUI OPTIONS_SUB= yes GUI_DESC= Build with graphics/gd dependency -GUI_LIB_DEPENDS+= libgd.so:${PORTSDIR}/graphics/gd +GUI_LIB_DEPENDS+= libgd.so:graphics/gd .include From owner-svn-ports-branches@freebsd.org Mon Oct 31 20:07:36 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 54B99C28BAA; Mon, 31 Oct 2016 20:07:36 +0000 (UTC) (envelope-from madpilot@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 mx1.freebsd.org (Postfix) with ESMTPS id 138F51C55; Mon, 31 Oct 2016 20:07:36 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9VK7ZLa058052; Mon, 31 Oct 2016 20:07:35 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9VK7YRT058046; Mon, 31 Oct 2016 20:07:34 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201610312007.u9VK7YRT058046@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 31 Oct 2016 20:07:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425022 - in branches/2016Q4: . www www/lighttpd www/lighttpd-mod_geoip www/lighttpd/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Oct 2016 20:07:36 -0000 Author: madpilot Date: Mon Oct 31 20:07:34 2016 New Revision: 425022 URL: https://svnweb.freebsd.org/changeset/ports/425022 Log: MFH: r424396 r425017 - Update lighttpd to 1.4.42 [1] - Convert WEBDAV option to option helpers [1] - Remove MYSQLAUTH option, upstream integrated their own solution in MYSQL support [1] - Add GEOIP option to main port [1] - Fix sorting in pkg-plist [1] - Remove lighttpd-mod_geoip port, it's beeen integrated in the main port [2] PR: 213568 [1], 213569 [2] Sumitted by: Piotr Kubaj (maintainer) Fix this port at runtime on 9.3. PR: 213848 Submitted by: cedric@precidata.com Approved by: pkubaj@anongoth.pl (maintainer) Approved by: ports-secteam (feld) Added: branches/2016Q4/www/lighttpd/files/patch-src_mod__cgi.c - copied unchanged from r425017, head/www/lighttpd/files/patch-src_mod__cgi.c Deleted: branches/2016Q4/www/lighttpd-mod_geoip/ branches/2016Q4/www/lighttpd/files/README.mysqlauth branches/2016Q4/www/lighttpd/files/extra-patch-src_Makefile.am branches/2016Q4/www/lighttpd/files/extra-patch-src_Makefile.in branches/2016Q4/www/lighttpd/files/extra-patch-src_http__auth.c branches/2016Q4/www/lighttpd/files/extra-patch-src_http__auth.h branches/2016Q4/www/lighttpd/files/extra-patch-src_mod__auth.c branches/2016Q4/www/lighttpd/files/mysql_auth.sql branches/2016Q4/www/lighttpd/files/patch-src_mod__fastcgi.c branches/2016Q4/www/lighttpd/files/patch-src_mod__proxy.c branches/2016Q4/www/lighttpd/files/patch-src_mod__scgi.c Modified: branches/2016Q4/MOVED branches/2016Q4/www/Makefile branches/2016Q4/www/lighttpd/Makefile branches/2016Q4/www/lighttpd/distinfo branches/2016Q4/www/lighttpd/pkg-plist Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/MOVED ============================================================================== --- branches/2016Q4/MOVED Mon Oct 31 18:17:42 2016 (r425021) +++ branches/2016Q4/MOVED Mon Oct 31 20:07:34 2016 (r425022) @@ -8663,3 +8663,4 @@ databases/postgresql91-pltcl||2016-10-02 databases/postgresql91-docs||2016-10-02|Has expired: End-of-life is near www/mediawiki125||2016-10-02|Has expired: EOL upstream multimedia/kvazaar-devel|multimedia/kvazaar|2016-10-05|Out of date: use multimedia/kvazaar for now +www/lighttpd-mod_geoip|www/lighttpd|2016-10-21|Integrated into www/lighttpd Modified: branches/2016Q4/www/Makefile ============================================================================== --- branches/2016Q4/www/Makefile Mon Oct 31 18:17:42 2016 (r425021) +++ branches/2016Q4/www/Makefile Mon Oct 31 20:07:34 2016 (r425022) @@ -358,7 +358,6 @@ SUBDIR += libxul SUBDIR += lightsquid SUBDIR += lighttpd - SUBDIR += lighttpd-mod_geoip SUBDIR += lighttpd-mod_h264_streaming SUBDIR += lilurl SUBDIR += limesurvey Modified: branches/2016Q4/www/lighttpd/Makefile ============================================================================== --- branches/2016Q4/www/lighttpd/Makefile Mon Oct 31 18:17:42 2016 (r425021) +++ branches/2016Q4/www/lighttpd/Makefile Mon Oct 31 20:07:34 2016 (r425022) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= lighttpd -PORTVERSION= 1.4.41 +PORTVERSION= 1.4.42 PORTREVISION= 1 CATEGORIES?= www MASTER_SITES?= http://download.lighttpd.net/lighttpd/releases-1.4.x/ @@ -19,6 +19,7 @@ LIB_DEPENDS+= libpcre.so:devel/pcre GNU_CONFIGURE= yes USES= autoreconf gmake libtool localbase pkgconfig tar:xz +USE_CSTD= gnu99 .if !defined(_BUILDING_LIGHTTPD_MODULE) USES+= cpe @@ -30,7 +31,7 @@ INSTALL_TARGET= install-strip .if !defined(_BUILDING_LIGHTTPD_MODULE) USE_RC_SUBR= lighttpd -OPTIONS_DEFINE= ATTR BZIP2 DOCS FAM GDBM IPV6 LIBEV LUA MEMCACHED MYSQL MYSQLAUTH \ +OPTIONS_DEFINE= ATTR BZIP2 DOCS FAM GDBM GEOIP IPV6 LIBEV LUA MEMCACHED MYSQL \ LDAP OPENSSL SPAWNFCGI VALGRIND WEBDAV OPTIONS_DEFAULT= OPENSSL @@ -43,7 +44,6 @@ LIBEV_DESC= Fast events support via libe LUA_DESC= lua support (mod_cml, mod_magnet) MEMCACHED_DESC= memcached storage (mod_trigger_b4_dl) MYSQL_DESC= MySQL support (mod_mysql_vhost) -MYSQLAUTH_DESC= MySQL authentication SPAWNFCGI_DESC= Depend on spawn-fcgi utility VALGRIND_DESC= valgrind support WEBDAV_DESC= WebDAV support @@ -55,6 +55,8 @@ FAM_CONFIGURE_ON= --with-fam FAM_CONFIGURE_ENV= FAM_CFLAGS="-I${LOCALBASE}/include" FAM_LIBS="-L${LOCALBASE}/lib" GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm GDBM_CONFIGURE_WITH= gdbm +GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP +GEOIP_CONFIGURE_WITH= geoip IPV6_CONFIGURE_OFF= --disable-ipv6 LIBEV_CONFIGURE_WITH= libev=${LOCALBASE} LIBEV_LIB_DEPENDS= libev.so:devel/libev @@ -63,7 +65,6 @@ LUA_CONFIGURE_WITH= lua LUA_CONFIGURE_ENV= LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached MEMCACHED_CONFIGURE_WITH=memcached -MYSQLAUTH_IMPLIES= MYSQL OPENSSL_USES= ssl OPENSSL_CONFIGURE_WITH= openssl OPENSSL_CONFIGURE_ON= --with-openssl-includes=${OPENSSLINC} --with-openssl-libs=${OPENSSLLIB} @@ -71,6 +72,10 @@ SPAWNFCGI_RUN_DEPENDS= spawn-fcgi:www/sp VALGRIND_BUILD_DEPENDS= valgrind:devel/valgrind VALGRIND_RUN_DEPENDS= valgrind:devel/valgrind VALGRIND_CONFIGURE_WITH=valgrind +WEBDAV_USE= GNOME=libxml2 +WEBDAV_LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ + libsqlite3.so:databases/sqlite3 +WEBDAV_CONFIGURE_WITH= webdav-props webdav-locks LIGHTTPD_CONF_FILES= lighttpd.conf modules.conf @@ -113,28 +118,12 @@ CONFIGURE_ARGS+= --with-mysql _REQUIRE+= mysql .endif -.if ${PORT_OPTIONS:MMYSQLAUTH} -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_Makefile.am \ - ${FILESDIR}/extra-patch-src_Makefile.in \ - ${FILESDIR}/extra-patch-src_http__auth.c \ - ${FILESDIR}/extra-patch-src_http__auth.h \ - ${FILESDIR}/extra-patch-src_mod__auth.c -PORTDOCS+= README.mysqlauth mysql_auth.sql -.endif - .if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= yes CONFIGURE_ARGS+= --with-ldap _REQUIRE+= slapd .endif -.if ${PORT_OPTIONS:MWEBDAV} -USE_GNOME+= libxml2 -LIB_DEPENDS+= libuuid.so:misc/e2fsprogs-libuuid \ - libsqlite3.so:databases/sqlite3 -CONFIGURE_ARGS+= --with-webdav-props --with-webdav-locks -.endif - SUB_LIST+= REQUIRE="${_REQUIRE}" post-patch: @@ -182,12 +171,6 @@ post-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}/${FILE} . endfor -post-install-MYSQLAUTH-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} -. for FILE in README.mysqlauth mysql_auth.sql - ${INSTALL_DATA} ${FILESDIR}/${FILE} ${STAGEDIR}${DOCSDIR}/${FILE} -. endfor - test: build @cd ${WRKSRC}/tests && ${SETENV} ${MAKE_ENV} ${MAKE} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} \ Modified: branches/2016Q4/www/lighttpd/distinfo ============================================================================== --- branches/2016Q4/www/lighttpd/distinfo Mon Oct 31 18:17:42 2016 (r425021) +++ branches/2016Q4/www/lighttpd/distinfo Mon Oct 31 20:07:34 2016 (r425022) @@ -1,7 +1,5 @@ -TIMESTAMP = 1470040166 -SHA256 (lighttpd-1.4.41.tar.xz) = 4bcc383ef6d6dc7b284f68882d71a178e2986c83c4e85eeb3c8f3b882e346b6c -SIZE (lighttpd-1.4.41.tar.xz) = 623480 -SHA256 (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch) = 4e6768af32ce16033fcb0c70b12c55b40082ca105a36f258b0bbf30d64e9dad3 -SIZE (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch) = 242458 -SHA256 (lighttpd-1.4.26_mod_geoip.patch) = 2858036310b778852d9f039a81629902edffc368658e13bf4779f3642ee1a5ba -SIZE (lighttpd-1.4.26_mod_geoip.patch) = 15173 +TIMESTAMP = 1476712210 +SHA256 (lighttpd-1.4.42.tar.xz) = b2c9069ed0bade9362c27b469a9b884641786aea1c3d686f9fd9f01d15e2a15f +SIZE (lighttpd-1.4.42.tar.xz) = 652140 +SHA256 (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch) = 716cd4f8d371e12c115a2204e649aafe2ebad42d0099777b1361c0e2cc8a1612 +SIZE (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch) = 242456 Copied: branches/2016Q4/www/lighttpd/files/patch-src_mod__cgi.c (from r425017, head/www/lighttpd/files/patch-src_mod__cgi.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/www/lighttpd/files/patch-src_mod__cgi.c Mon Oct 31 20:07:34 2016 (r425022, copy of r425017, head/www/lighttpd/files/patch-src_mod__cgi.c) @@ -0,0 +1,19 @@ +--- src/mod_cgi.c.orig 2016-10-16 10:48:26 UTC ++++ src/mod_cgi.c +@@ -32,13 +32,14 @@ + #include + #include + #include ++#include + + #include + #include + +-#ifdef O_CLOEXEC ++#if defined(O_CLOEXEC) && __FreeBSD_version >= 1000032 + #define pipe_cloexec(pipefd) pipe2((pipefd), O_CLOEXEC) +-#elif defined FD_CLOEXEC ++#elif defined(FD_CLOEXEC) + #define pipe_cloexec(pipefd) \ + ( 0 == pipe(pipefd) \ + && 0 == fcntl(pipefd[0], F_SETFD, FD_CLOEXEC) \ Modified: branches/2016Q4/www/lighttpd/pkg-plist ============================================================================== --- branches/2016Q4/www/lighttpd/pkg-plist Mon Oct 31 18:17:42 2016 (r425021) +++ branches/2016Q4/www/lighttpd/pkg-plist Mon Oct 31 20:07:34 2016 (r425022) @@ -2,8 +2,8 @@ @sample etc/lighttpd/modules.conf.sample @sample etc/lighttpd/conf.d/access_log.conf.sample @sample etc/lighttpd/conf.d/auth.conf.sample -@sample etc/lighttpd/conf.d/cml.conf.sample @sample etc/lighttpd/conf.d/cgi.conf.sample +@sample etc/lighttpd/conf.d/cml.conf.sample @sample etc/lighttpd/conf.d/compress.conf.sample @sample etc/lighttpd/conf.d/debug.conf.sample @sample etc/lighttpd/conf.d/dirlisting.conf.sample @@ -28,9 +28,14 @@ lib/lighttpd/mod_access.so lib/lighttpd/mod_accesslog.so lib/lighttpd/mod_alias.so lib/lighttpd/mod_auth.so +lib/lighttpd/mod_authn_file.so +lib/lighttpd/mod_authn_gssapi.so +lib/lighttpd/mod_authn_ldap.so +lib/lighttpd/mod_authn_mysql.so lib/lighttpd/mod_cgi.so lib/lighttpd/mod_cml.so lib/lighttpd/mod_compress.so +lib/lighttpd/mod_deflate.so lib/lighttpd/mod_dirlisting.so lib/lighttpd/mod_evasive.so lib/lighttpd/mod_evhost.so @@ -38,6 +43,7 @@ lib/lighttpd/mod_expire.so lib/lighttpd/mod_extforward.so lib/lighttpd/mod_fastcgi.so lib/lighttpd/mod_flv_streaming.so +lib/lighttpd/mod_geoip.so lib/lighttpd/mod_indexfile.so lib/lighttpd/mod_magnet.so lib/lighttpd/mod_mysql_vhost.so @@ -53,6 +59,7 @@ lib/lighttpd/mod_ssi.so lib/lighttpd/mod_staticfile.so lib/lighttpd/mod_status.so lib/lighttpd/mod_trigger_b4_dl.so +lib/lighttpd/mod_uploadprogress.so lib/lighttpd/mod_userdir.so lib/lighttpd/mod_usertrack.so lib/lighttpd/mod_webdav.so From owner-svn-ports-branches@freebsd.org Mon Oct 31 21:47:45 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CAEC9C28474; Mon, 31 Oct 2016 21:47:45 +0000 (UTC) (envelope-from jhale@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 mx1.freebsd.org (Postfix) with ESMTPS id 79394197F; Mon, 31 Oct 2016 21:47:45 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9VLli4Y096825; Mon, 31 Oct 2016 21:47:44 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9VLliin096824; Mon, 31 Oct 2016 21:47:44 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201610312147.u9VLliin096824@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Mon, 31 Oct 2016 21:47:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425030 - branches/2016Q4/net-im/qTox X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Oct 2016 21:47:45 -0000 Author: jhale Date: Mon Oct 31 21:47:44 2016 New Revision: 425030 URL: https://svnweb.freebsd.org/changeset/ports/425030 Log: MFH: r424975 Fix build for 9.x i386 Quarterly branch has a different version, but suffers from the same error, so the fix should be backported. videoframe.o: In function `VideoFrame::VideoFrame(unsigned long long, AVFrame*, QRect, int, bool)': videoframe.cpp:(.text+0x19db): undefined reference to `__atomic_fetch_add_8' camerasource.o: In function `CameraSource::CameraSource()': camerasource.cpp:(.text+0x327): undefined reference to `__atomic_fetch_add_8' corevideosource.o: In function `CoreVideoSource::CoreVideoSource()': corevideosource.cpp:(.text+0x121): undefined reference to `__atomic_fetch_add_8' collect2: error: ld returned 1 exit status gmake: *** [Makefile:793: qtox] Error 1 PR: 213841 Submitted by: Approved by: (maintainer) Approved by: ports-secteam (feld) Modified: branches/2016Q4/net-im/qTox/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/net-im/qTox/Makefile ============================================================================== --- branches/2016Q4/net-im/qTox/Makefile Mon Oct 31 21:42:43 2016 (r425029) +++ branches/2016Q4/net-im/qTox/Makefile Mon Oct 31 21:47:44 2016 (r425030) @@ -46,6 +46,13 @@ PLIST_FILES= bin/qtox \ PLIST_FILES+= share/icons/hicolor/${SZ}/apps/qtox.png .endfor +.include + +.if ${CHOSEN_COMPILER_TYPE} == "gcc" && ${ARCH} == i386 && !${CFLAGS:M-march=*} +# Needed for __atomic_fetch_add_8 +CFLAGS+= -march=i586 +.endif + pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "Warning: qTox won't build if the option NaCl was selected for Tox!" @@ -74,4 +81,4 @@ post-install: ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}/apps/qtox.png .endfor -.include +.include From owner-svn-ports-branches@freebsd.org Mon Oct 31 21:51:27 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EB473C28522; Mon, 31 Oct 2016 21:51:27 +0000 (UTC) (envelope-from jhale@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 mx1.freebsd.org (Postfix) with ESMTPS id C337E1C71; Mon, 31 Oct 2016 21:51:27 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9VLpQKx099176; Mon, 31 Oct 2016 21:51:26 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9VLpQK4099173; Mon, 31 Oct 2016 21:51:26 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201610312151.u9VLpQK4099173@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Mon, 31 Oct 2016 21:51:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425031 - branches/2016Q4/www/axis2 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Oct 2016 21:51:28 -0000 Author: jhale Date: Mon Oct 31 21:51:26 2016 New Revision: 425031 URL: https://svnweb.freebsd.org/changeset/ports/425031 Log: MFH: r424977 Update to 1.7.4 PR: 213792 Submitted by: Danilo G. Baio (maintainer) Security: ac18046c-9b08-11e6-8011-005056925db4 Approved by: ports-secteam (feld) Modified: branches/2016Q4/www/axis2/Makefile branches/2016Q4/www/axis2/distinfo branches/2016Q4/www/axis2/pkg-plist Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/www/axis2/Makefile ============================================================================== --- branches/2016Q4/www/axis2/Makefile Mon Oct 31 21:47:44 2016 (r425030) +++ branches/2016Q4/www/axis2/Makefile Mon Oct 31 21:51:26 2016 (r425031) @@ -1,10 +1,10 @@ # $FreeBSD$ PORTNAME= axis2 -PORTVERSION= 1.7.3 +PORTVERSION= 1.7.4 CATEGORIES= www java MASTER_SITES= APACHE/axis/${PORTNAME}/java/core/${PORTVERSION}/ -DISTFILES= ${PORTNAME}-${PORTVERSION}-bin.zip ${PORTNAME}-${PORTVERSION}-war.zip +DISTNAME= ${PORTNAME}-${PORTVERSION}-bin MAINTAINER= dbaio@bsd.com.br COMMENT= Provides a Web Services,SOAP and WSDL engine from Apache @@ -39,17 +39,14 @@ PLIST_SUB+= APPHOME=${APPHOME:S|^${PREFI PORTVERSION=${PORTVERSION} do-install: - ( ${MKDIR} ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/lib && cd ${WRKSRC}/lib && ${COPYTREE_SHARE} \* ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/lib ) - ( ${MKDIR} ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/classes && cd ${WRKSRC}/webapp/WEB-INF/classes && ${COPYTREE_SHARE} \* ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/classes ) + ( ${MKDIR} ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF && cd ${WRKSRC}/webapp/WEB-INF && ${COPYTREE_SHARE} \* ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF ) + ( cd ${WRKSRC}/lib && ${COPYTREE_SHARE} \* ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/lib ) ( ${MKDIR} ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/axis2-web && cd ${WRKSRC}/webapp/axis2-web && ${COPYTREE_SHARE} \* ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/axis2-web ) ( cd ${WRKSRC}/repository && ${COPYTREE_SHARE} \* ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF ) - ${MKDIR} ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/conf .for f in axis2.policy axis2.xml commons-logging.properties log4j.properties ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/conf/${f}.sample .endfor - ${INSTALL_DATA} ${WRKSRC}/webapp/WEB-INF/web.xml ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/web.xml.sample - @${TAR} -C ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/ \ - -xf ${WRKDIR}/${PORTNAME}.war WEB-INF/include/ WEB-INF/views/ + ${MV} ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/web.xml ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/web.xml.sample do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} Modified: branches/2016Q4/www/axis2/distinfo ============================================================================== --- branches/2016Q4/www/axis2/distinfo Mon Oct 31 21:47:44 2016 (r425030) +++ branches/2016Q4/www/axis2/distinfo Mon Oct 31 21:51:26 2016 (r425031) @@ -1,5 +1,3 @@ -TIMESTAMP = 1476566283 -SHA256 (axis2-1.7.3-bin.zip) = 9605e2726af535a0bc6007dff59d6a4d03dab0c2b119b234ad1d5b34b77f5d2d -SIZE (axis2-1.7.3-bin.zip) = 22315355 -SHA256 (axis2-1.7.3-war.zip) = 73625e6a462f93e4b996e8f78bf63286e6e071cc8e42495c5cea3d2034c2f211 -SIZE (axis2-1.7.3-war.zip) = 20191858 +TIMESTAMP = 1477438541 +SHA256 (axis2-1.7.4-bin.zip) = 84da15ac8bfe1ddf16078052cb41fc6304ef1b2f8ada86fcfcc48adcba297e0e +SIZE (axis2-1.7.4-bin.zip) = 22701868 Modified: branches/2016Q4/www/axis2/pkg-plist ============================================================================== --- branches/2016Q4/www/axis2/pkg-plist Mon Oct 31 21:47:44 2016 (r425030) +++ branches/2016Q4/www/axis2/pkg-plist Mon Oct 31 21:51:26 2016 (r425031) @@ -37,10 +37,10 @@ %%APPHOME%%/webapps/axis2/WEB-INF/lib/apache-mime4j-core-0.7.2.jar %%APPHOME%%/webapps/axis2/WEB-INF/lib/apache-mime4j-core-LICENSE.txt %%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-LICENSE.txt -%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-api-1.2.19.jar -%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-dom-1.2.19.jar -%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-impl-1.2.19.jar -%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-jaxb-1.2.19.jar +%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-api-1.2.20.jar +%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-dom-1.2.20.jar +%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-impl-1.2.20.jar +%%APPHOME%%/webapps/axis2/WEB-INF/lib/axiom-jaxb-1.2.20.jar %%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-LICENSE.txt %%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-adb-%%PORTVERSION%%.jar %%APPHOME%%/webapps/axis2/WEB-INF/lib/axis2-adb-codegen-%%PORTVERSION%%.jar @@ -100,9 +100,9 @@ %%APPHOME%%/webapps/axis2/WEB-INF/lib/geronimo-ws-metadata_2.0_spec-1.1.2.jar %%APPHOME%%/webapps/axis2/WEB-INF/lib/gson-2.1.jar %%APPHOME%%/webapps/axis2/WEB-INF/lib/gson-LICENSE.txt -%%APPHOME%%/webapps/axis2/WEB-INF/lib/httpclient-4.2.5.jar +%%APPHOME%%/webapps/axis2/WEB-INF/lib/httpclient-4.5.2.jar %%APPHOME%%/webapps/axis2/WEB-INF/lib/httpclient-LICENSE.txt -%%APPHOME%%/webapps/axis2/WEB-INF/lib/httpcore-4.2.5.jar +%%APPHOME%%/webapps/axis2/WEB-INF/lib/httpcore-4.4.4.jar %%APPHOME%%/webapps/axis2/WEB-INF/lib/httpcore-LICENSE.txt %%APPHOME%%/webapps/axis2/WEB-INF/lib/jalopy-1.5rc3.jar %%APPHOME%%/webapps/axis2/WEB-INF/lib/jalopy-LICENSE.txt @@ -160,7 +160,9 @@ %%APPHOME%%/webapps/axis2/WEB-INF/modules/soapmonitor-%%PORTVERSION%%.mar %%APPHOME%%/webapps/axis2/WEB-INF/services/services.list %%APPHOME%%/webapps/axis2/WEB-INF/services/version.aar -@mode 644 +%%APPHOME%%/webapps/axis2/WEB-INF/tags/status.tag +%%APPHOME%%/webapps/axis2/WEB-INF/views/listFaultyService.jsp +%%APPHOME%%/webapps/axis2/WEB-INF/views/listServices.jsp %%APPHOME%%/webapps/axis2/WEB-INF/views/admin/Login.jsp %%APPHOME%%/webapps/axis2/WEB-INF/views/admin/SelectService.jsp %%APPHOME%%/webapps/axis2/WEB-INF/views/admin/activateService.jsp @@ -184,7 +186,6 @@ %%APPHOME%%/webapps/axis2/WEB-INF/views/admin/viewServiceContext.jsp %%APPHOME%%/webapps/axis2/WEB-INF/views/admin/viewServiceGroupContext.jsp %%APPHOME%%/webapps/axis2/WEB-INF/views/admin/viewphases.jsp -@mode @sample %%APPHOME%%/webapps/axis2/WEB-INF/web.xml.sample %%APPHOME%%/webapps/axis2/axis2-web/Error/AuthError.html %%APPHOME%%/webapps/axis2/axis2-web/Error/GenError.html @@ -199,9 +200,6 @@ %%APPHOME%%/webapps/axis2/axis2-web/images/axis.jpg %%APPHOME%%/webapps/axis2/axis2-web/images/axis_l.jpg %%APPHOME%%/webapps/axis2/axis2-web/index.jsp -%%APPHOME%%/webapps/axis2/axis2-web/listFaultyService.jsp -%%APPHOME%%/webapps/axis2/axis2-web/listGroupService.jsp -%%APPHOME%%/webapps/axis2/axis2-web/listServices.jsp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/databinding/README.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/databinding/StockQuote.xsd %%PORTEXAMPLES%%%%EXAMPLESDIR%%/databinding/StockQuoteService.wsdl From owner-svn-ports-branches@freebsd.org Mon Oct 31 21:52:52 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A99D0C28644; Mon, 31 Oct 2016 21:52:52 +0000 (UTC) (envelope-from jhale@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 mx1.freebsd.org (Postfix) with ESMTPS id 785E91E16; Mon, 31 Oct 2016 21:52:52 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9VLqp7u000768; Mon, 31 Oct 2016 21:52:51 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9VLqpqX000767; Mon, 31 Oct 2016 21:52:51 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201610312152.u9VLqpqX000767@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Mon, 31 Oct 2016 21:52:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425032 - in branches/2016Q4/games/xmris: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Oct 2016 21:52:52 -0000 Author: jhale Date: Mon Oct 31 21:52:51 2016 New Revision: 425032 URL: https://svnweb.freebsd.org/changeset/ports/425032 Log: MFH: r424989 Fix 100% CPU utilization (runtime tested on FreeBSD 11.0, i386) Bump PORTREVISION PR: 211791 Submitted by: Approved by: ports-secteam (feld) Modified: branches/2016Q4/games/xmris/Makefile branches/2016Q4/games/xmris/files/patch-timer.c Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/games/xmris/Makefile ============================================================================== --- branches/2016Q4/games/xmris/Makefile Mon Oct 31 21:51:26 2016 (r425031) +++ branches/2016Q4/games/xmris/Makefile Mon Oct 31 21:52:51 2016 (r425032) @@ -3,7 +3,7 @@ PORTNAME= xmris PORTVERSION= 4.04 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= XCONTRIB/games DISTNAME= ${PORTNAME}.${PORTVERSION} Modified: branches/2016Q4/games/xmris/files/patch-timer.c ============================================================================== --- branches/2016Q4/games/xmris/files/patch-timer.c Mon Oct 31 21:51:26 2016 (r425031) +++ branches/2016Q4/games/xmris/files/patch-timer.c Mon Oct 31 21:52:51 2016 (r425032) @@ -9,3 +9,14 @@ #else # ifdef __hpux /* hpux is a weird mixture of BSD & SYSV */ /* don't know if this is right */ +@@ -572,7 +572,10 @@ extern VOIDFUNC timer_wait FUNCARGVOID + else + { + while(!tickafter(now, timer.timeout)) ++ { ++ usleep(tickdelta(timer.timeout, now) * TICKTIME); + gettick(&now); ++ } + timer.timeout = tickadd(timer.timeout, timer.delay); + point = -1; + } From owner-svn-ports-branches@freebsd.org Tue Nov 1 12:01:54 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EE933C2AA53; Tue, 1 Nov 2016 12:01:54 +0000 (UTC) (envelope-from riggs@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 mx1.freebsd.org (Postfix) with ESMTPS id CA99112B7; Tue, 1 Nov 2016 12:01:54 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA1C1so1024531; Tue, 1 Nov 2016 12:01:54 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA1C1raG024528; Tue, 1 Nov 2016 12:01:53 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201611011201.uA1C1raG024528@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Tue, 1 Nov 2016 12:01:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425048 - branches/2016Q4/multimedia/mplayer-skins X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Nov 2016 12:01:55 -0000 Author: riggs Date: Tue Nov 1 12:01:53 2016 New Revision: 425048 URL: https://svnweb.freebsd.org/changeset/ports/425048 Log: MFH: r425047 Update to latest versions of skins; make distfiles fetchable again PR: 213793 Submitted by: jhale Approved by: ports-secteam (build fix blanket) Modified: branches/2016Q4/multimedia/mplayer-skins/Makefile branches/2016Q4/multimedia/mplayer-skins/Makefile.skins branches/2016Q4/multimedia/mplayer-skins/distinfo Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/multimedia/mplayer-skins/Makefile ============================================================================== --- branches/2016Q4/multimedia/mplayer-skins/Makefile Tue Nov 1 11:50:57 2016 (r425047) +++ branches/2016Q4/multimedia/mplayer-skins/Makefile Tue Nov 1 12:01:53 2016 (r425048) @@ -3,7 +3,7 @@ PORTNAME= mplayer-skins PORTVERSION= 1.1.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= MPLAYERHQ/skins DISTFILES= # filled in later after options Modified: branches/2016Q4/multimedia/mplayer-skins/Makefile.skins ============================================================================== --- branches/2016Q4/multimedia/mplayer-skins/Makefile.skins Tue Nov 1 11:50:57 2016 (r425047) +++ branches/2016Q4/multimedia/mplayer-skins/Makefile.skins Tue Nov 1 12:01:53 2016 (r425048) @@ -16,8 +16,8 @@ CORNERMP_AQUA_FILE= CornerMP-aqua-1.4 CORNERMP_FILE= CornerMP-1.2 CUBICPLAYER_FILE= CubicPlayer-1.1 CYRUS_FILE= Cyrus-1.2 -DEFAULT_FILE= Blue-1.10 -DEFAULT_SMALL_FILE= Blue-small-1.8 +DEFAULT_FILE= Blue-1.12 +DEFAULT_SMALL_FILE= Blue-small-1.9 DISAPPEARER_FILE= disappearer-1.2 DIVXPLAYER_FILE= divxplayer-1.3 DUSHKU_FILE= Dushku-1.2 Modified: branches/2016Q4/multimedia/mplayer-skins/distinfo ============================================================================== --- branches/2016Q4/multimedia/mplayer-skins/distinfo Tue Nov 1 11:50:57 2016 (r425047) +++ branches/2016Q4/multimedia/mplayer-skins/distinfo Tue Nov 1 12:01:53 2016 (r425048) @@ -1,4 +1,4 @@ -TIMESTAMP = 1471184655 +TIMESTAMP = 1477445276 SHA256 (mplayer-skins/Abyss-1.7.tar.bz2) = a13fab46a2b25f1e81a578fb1e4ce52707cc582617defac54e2c51da508699c0 SIZE (mplayer-skins/Abyss-1.7.tar.bz2) = 292235 SHA256 (mplayer-skins/AlienMind-1.2.tar.bz2) = 6baa0700bb303435eb5fb0f0dba15cc1b20413ff0987ea591c66c2b0c61c4129 @@ -25,10 +25,10 @@ SHA256 (mplayer-skins/CubicPlayer-1.1.ta SIZE (mplayer-skins/CubicPlayer-1.1.tar.bz2) = 124470 SHA256 (mplayer-skins/Cyrus-1.2.tar.bz2) = 01711f51fd1706e53de17c19b412acc5bcc5ead51aea2a5b3ccf0bf2a1d20d11 SIZE (mplayer-skins/Cyrus-1.2.tar.bz2) = 228461 -SHA256 (mplayer-skins/Blue-1.10.tar.bz2) = 057524753e032df7c0f9aa2c14f867f245559f685964fba4ac54a9a99768f0f5 -SIZE (mplayer-skins/Blue-1.10.tar.bz2) = 222555 -SHA256 (mplayer-skins/Blue-small-1.8.tar.bz2) = 6f0d5c50675b62078576c08fbb9adbd9b9ebd2ab32569fbca14c8aeda489e7fa -SIZE (mplayer-skins/Blue-small-1.8.tar.bz2) = 157095 +SHA256 (mplayer-skins/Blue-1.12.tar.bz2) = 257cff0eaa6db72aa2aef791ccd5afb63cdeb3ca046bc976093381bb6004c66b +SIZE (mplayer-skins/Blue-1.12.tar.bz2) = 222625 +SHA256 (mplayer-skins/Blue-small-1.9.tar.bz2) = 33d220d583279af7d4058717cf8e47a7b10afab7835fb8cc47a76d7304fa1aa4 +SIZE (mplayer-skins/Blue-small-1.9.tar.bz2) = 157062 SHA256 (mplayer-skins/disappearer-1.2.tar.bz2) = d0c3883e4d44892b7bd9e20b63d3c4baf089c42174cdc54ebbcfb69b651a8880 SIZE (mplayer-skins/disappearer-1.2.tar.bz2) = 55578 SHA256 (mplayer-skins/divxplayer-1.3.tar.bz2) = 77fdb86abc82ece0330fa41c9923a09c20893d22b585a3787acd2ce7e598fc8a From owner-svn-ports-branches@freebsd.org Tue Nov 1 12:22:54 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 717A2C23279; Tue, 1 Nov 2016 12:22:54 +0000 (UTC) (envelope-from feld@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 mx1.freebsd.org (Postfix) with ESMTPS id 2512216E4; Tue, 1 Nov 2016 12:22:54 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA1CMrkR033138; Tue, 1 Nov 2016 12:22:53 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA1CMrE8033136; Tue, 1 Nov 2016 12:22:53 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201611011222.uA1CMrE8033136@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 1 Nov 2016 12:22:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425051 - branches/2016Q4/net-p2p/sonarr X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Nov 2016 12:22:54 -0000 Author: feld Date: Tue Nov 1 12:22:52 2016 New Revision: 425051 URL: https://svnweb.freebsd.org/changeset/ports/425051 Log: MFH: r425029 r425050 net-p2p/sonarr: Update to 2.0.0.4374 - Add new library dependency As of mono 4.6 Sonarr will crash if libgdiplus.so is not installed. Approved by: ports-secteam (with hat) Modified: branches/2016Q4/net-p2p/sonarr/Makefile branches/2016Q4/net-p2p/sonarr/distinfo Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/net-p2p/sonarr/Makefile ============================================================================== --- branches/2016Q4/net-p2p/sonarr/Makefile Tue Nov 1 12:21:14 2016 (r425050) +++ branches/2016Q4/net-p2p/sonarr/Makefile Tue Nov 1 12:22:52 2016 (r425051) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= sonarr -PORTVERSION= 2.0.0.4326 +PORTVERSION= 2.0.0.4374 PORTREVISION= 0 CATEGORIES= net-p2p MASTER_SITES= http://download.sonarr.tv/v2/master/mono/ @@ -15,7 +15,8 @@ LICENSE= GPLv3 RUN_DEPENDS= mono>0:lang/mono \ mediainfo>0:multimedia/mediainfo \ sqlite3>0:databases/sqlite3 -LIB_DEPENDS= libcurl.so:ftp/curl +LIB_DEPENDS= libcurl.so:ftp/curl \ + libgdiplus.so:x11-toolkits/libgdiplus USE_RC_SUBR= sonarr Modified: branches/2016Q4/net-p2p/sonarr/distinfo ============================================================================== --- branches/2016Q4/net-p2p/sonarr/distinfo Tue Nov 1 12:21:14 2016 (r425050) +++ branches/2016Q4/net-p2p/sonarr/distinfo Tue Nov 1 12:22:52 2016 (r425051) @@ -1,3 +1,3 @@ -TIMESTAMP = 1473859962 -SHA256 (NzbDrone.master.2.0.0.4326.mono.tar.gz) = f934aa799f9e4a0a17d72e424c88ac4e31456b5313f4fb0dce55cb553ce72ed3 -SIZE (NzbDrone.master.2.0.0.4326.mono.tar.gz) = 6437502 +TIMESTAMP = 1478002681 +SHA256 (NzbDrone.master.2.0.0.4374.mono.tar.gz) = e69c2b4b8f6b9fae590852aa98a9159f430e86df397643ef81d1f987cdf34af9 +SIZE (NzbDrone.master.2.0.0.4374.mono.tar.gz) = 6458032 From owner-svn-ports-branches@freebsd.org Tue Nov 1 16:21:47 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B1FD2C2A475; Tue, 1 Nov 2016 16:21:47 +0000 (UTC) (envelope-from jbeich@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 mx1.freebsd.org (Postfix) with ESMTPS id 80B7810B4; Tue, 1 Nov 2016 16:21:47 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA1GLkjn024940; Tue, 1 Nov 2016 16:21:46 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA1GLkMA024939; Tue, 1 Nov 2016 16:21:46 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201611011621.uA1GLkMA024939@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 1 Nov 2016 16:21:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425058 - branches/2016Q4/graphics/aseprite X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Nov 2016 16:21:47 -0000 Author: jbeich Date: Tue Nov 1 16:21:46 2016 New Revision: 425058 URL: https://svnweb.freebsd.org/changeset/ports/425058 Log: MFH: r425057 graphics/aseprite: unbreak build on 9.x PR: 213756 (for tracking) Approved by: portmgr blanket Approved by: ports-secteam blanket Modified: branches/2016Q4/graphics/aseprite/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/graphics/aseprite/Makefile ============================================================================== --- branches/2016Q4/graphics/aseprite/Makefile Tue Nov 1 16:13:23 2016 (r425057) +++ branches/2016Q4/graphics/aseprite/Makefile Tue Nov 1 16:21:46 2016 (r425058) @@ -20,8 +20,6 @@ LIB_DEPENDS= libfreetype.so:print/freet libcurl.so:ftp/curl \ libtinyxml.so:textproc/tinyxml -BROKEN_FreeBSD_9= Fails due to compiler issues - OPTIONS_DEFINE= WEBP OPTIONS_DEFAULT= WEBP @@ -53,6 +51,7 @@ CMAKE_ARGS+= -DFREETYPE_INCLUDE_DIR=${L CXXFLAGS+= -I${LOCALBASE}/include CXXFLAGS+= -I${LOCALBASE}/include/freetype2 CXXFLAGS+= -I${LOCALBASE}/include/freetype2/freetype +CXXFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528 post-extract: @${MKDIR} ${WRKSRC}/third_party/pixman/pixman From owner-svn-ports-branches@freebsd.org Tue Nov 1 21:03:34 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F342AC2A152; Tue, 1 Nov 2016 21:03:33 +0000 (UTC) (envelope-from feld@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 mx1.freebsd.org (Postfix) with ESMTPS id 6BFDD191B; Tue, 1 Nov 2016 21:03:33 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA1L3WIs038120; Tue, 1 Nov 2016 21:03:32 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA1L3Wk3038115; Tue, 1 Nov 2016 21:03:32 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201611012103.uA1L3Wk3038115@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 1 Nov 2016 21:03:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425093 - in branches/2016Q4/net-mgmt/rancid3: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Nov 2016 21:03:34 -0000 Author: feld Date: Tue Nov 1 21:03:32 2016 New Revision: 425093 URL: https://svnweb.freebsd.org/changeset/ports/425093 Log: MFH: r425092 net-mgmt/rancid3: port improvements - Add periodic script - Change PREFIX to LOCALBASE in port Makefile - Inform users of periodic script via updated pkg-message Approved by: ports-secteam (with hat) Added: branches/2016Q4/net-mgmt/rancid3/files/200.rancid.in - copied unchanged from r425092, head/net-mgmt/rancid3/files/200.rancid.in Modified: branches/2016Q4/net-mgmt/rancid3/Makefile branches/2016Q4/net-mgmt/rancid3/files/pkg-message.in branches/2016Q4/net-mgmt/rancid3/pkg-plist Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/net-mgmt/rancid3/Makefile ============================================================================== --- branches/2016Q4/net-mgmt/rancid3/Makefile Tue Nov 1 21:02:13 2016 (r425092) +++ branches/2016Q4/net-mgmt/rancid3/Makefile Tue Nov 1 21:03:32 2016 (r425093) @@ -3,7 +3,7 @@ PORTNAME= rancid PORTVERSION= 3.5.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/ PKGNAMESUFFIX= 3 @@ -21,12 +21,12 @@ SHEBANG_FILES= bin/* USERS= rancid GROUPS= rancid -SUB_FILES= pkg-message +SUB_FILES= pkg-message 200.rancid GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/var/${PORTNAME}/ \ - --bindir=${PREFIX}/libexec/${PORTNAME}/ \ - --sysconfdir=${PREFIX}/etc/${PORTNAME}/ +CONFIGURE_ARGS= --localstatedir=${LOCALBASE}/var/${PORTNAME}/ \ + --bindir=${LOCALBASE}/libexec/${PORTNAME}/ \ + --sysconfdir=${LOCALBASE}/etc/${PORTNAME}/ OLDCONFIG_FILE1= bin/env OLDCONFIG_FILE2= util/lg/lg.conf @@ -71,43 +71,45 @@ post-patch: ${MV} ${WRKSRC}/man/par.1 ${WRKSRC}/man/rancid-par.1 post-install: - ${LN} -s ${PREFIX}/libexec/${PORTNAME}/rancid-cvs ${STAGEDIR}${PREFIX}/bin - ${LN} -s ${PREFIX}/libexec/${PORTNAME}/rancid-run ${STAGEDIR}${PREFIX}/bin + ${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/periodic/hourly + ${INSTALL_SCRIPT} ${WRKDIR}/200.rancid ${STAGEDIR}${LOCALBASE}/etc/periodic/hourly + ${LN} -s ${LOCALBASE}/libexec/${PORTNAME}/rancid-cvs ${STAGEDIR}${LOCALBASE}/bin + ${LN} -s ${LOCALBASE}/libexec/${PORTNAME}/rancid-run ${STAGEDIR}${LOCALBASE}/bin .if ${PORT_OPTIONS:MCOMWARE} - ${INSTALL_DATA} ${FILESDIR}/cmw.pm ${STAGEDIR}/${PREFIX}/lib/rancid - ${INSTALL_SCRIPT} ${FILESDIR}/cmwlogin ${STAGEDIR}/${PREFIX}/libexec/rancid + ${INSTALL_DATA} ${FILESDIR}/cmw.pm ${STAGEDIR}/${LOCALBASE}/lib/rancid + ${INSTALL_SCRIPT} ${FILESDIR}/cmwlogin ${STAGEDIR}/${LOCALBASE}/libexec/rancid .endif .for file in ${NEWCONFIG_FILES} - @ if [ -f ${PREFIX}/etc/${PORTNAME}/${file} ] ; then \ - ${ECHO} "WARNING: *** new ${file} file is installed as ${PREFIX}/rancid/${file}.sample"; \ + @ if [ -f ${LOCALBASE}/etc/${PORTNAME}/${file} ] ; then \ + ${ECHO} "WARNING: *** new ${file} file is installed as ${LOCALBASE}/rancid/${file}.sample"; \ ${ECHO} " : *** review ${file}.sample for new/deprecated switches or install in place ${file}"; \ fi .endfor - @ if [ -f ${PREFIX}/rancid/${NEWERCONFIG_FILE1} ] ; then \ - ${ECHO} "WARNING: *** ${PREFIX}/rancid/${NEWERCONFIG_FILE1} has been replaced with "; \ - ${ECHO} " : *** ${PREFIX}/etc/${PORTNAME}/rancid.conf. Merge from sample and old file "; \ - fi - @ if [ -f ${PREFIX}/rancid/${NEWERCONFIG_FILE2} ] ; then \ - ${ECHO} "WARNING: *** ${PREFIX}/rancid/${NEWERCONFIG_FILE2} has been replaced with "; \ - ${ECHO} " : *** ${PREFIX}/etc/${PORTNAME}/lg.conf. Merge from sample and old file "; \ - fi - @ if [ -f ${PREFIX}/rancid/${NEWERCONFIG_FILE1} -o \ - -f ${PREFIX}/rancid/${NEWERCONFIG_FILE2} ] ; then \ - ${ECHO} "WARNING: *** New CVS Repository will be stored ${PREFIX}/var/${PORTNAME}/ "; \ + @ if [ -f ${LOCALBASE}/rancid/${NEWERCONFIG_FILE1} ] ; then \ + ${ECHO} "WARNING: *** ${LOCALBASE}/rancid/${NEWERCONFIG_FILE1} has been replaced with "; \ + ${ECHO} " : *** ${LOCALBASE}/etc/${PORTNAME}/rancid.conf. Merge from sample and old file "; \ + fi + @ if [ -f ${LOCALBASE}/rancid/${NEWERCONFIG_FILE2} ] ; then \ + ${ECHO} "WARNING: *** ${LOCALBASE}/rancid/${NEWERCONFIG_FILE2} has been replaced with "; \ + ${ECHO} " : *** ${LOCALBASE}/etc/${PORTNAME}/lg.conf. Merge from sample and old file "; \ + fi + @ if [ -f ${LOCALBASE}/rancid/${NEWERCONFIG_FILE1} -o \ + -f ${LOCALBASE}/rancid/${NEWERCONFIG_FILE2} ] ; then \ + ${ECHO} "WARNING: *** New CVS Repository will be stored ${LOCALBASE}/var/${PORTNAME}/ "; \ ${ECHO} " : *** Copy the repository if you want to keep the history "; \ fi - @ if [ -f ${PREFIX}/rancid/${OLDCONFIG_FILE1} ] ; then \ - ${ECHO} "WARNING: *** ${PREFIX}/rancid/${OLDCONFIG_FILE1} has been replaced with "; \ - ${ECHO} " : *** ${PREFIX}/etc/${PORTNAME}/rancid.conf. Merge from sample and old file "; \ - fi - @ if [ -f ${PREFIX}/rancid/${OLDCONFIG_FILE2} ] ; then \ - ${ECHO} "WARNING: *** ${PREFIX}/rancid/${OLDCONFIG_FILE2} has been replaced with "; \ - ${ECHO} " : *** ${PREFIX}/etc/${PORTNAME}/lg.conf. Merge from sample and old file "; \ - fi - @ if [ -f ${PREFIX}/rancid/${OLDCONFIG_FILE1} -o \ - -f ${PREFIX}/rancid/${OLDCONFIG_FILE2} ] ; then \ - ${ECHO} "WARNING: *** New CVS Repository will be stored ${PREFIX}/rancid/var "; \ + @ if [ -f ${LOCALBASE}/rancid/${OLDCONFIG_FILE1} ] ; then \ + ${ECHO} "WARNING: *** ${LOCALBASE}/rancid/${OLDCONFIG_FILE1} has been replaced with "; \ + ${ECHO} " : *** ${LOCALBASE}/etc/${PORTNAME}/rancid.conf. Merge from sample and old file "; \ + fi + @ if [ -f ${LOCALBASE}/rancid/${OLDCONFIG_FILE2} ] ; then \ + ${ECHO} "WARNING: *** ${LOCALBASE}/rancid/${OLDCONFIG_FILE2} has been replaced with "; \ + ${ECHO} " : *** ${LOCALBASE}/etc/${PORTNAME}/lg.conf. Merge from sample and old file "; \ + fi + @ if [ -f ${LOCALBASE}/rancid/${OLDCONFIG_FILE1} -o \ + -f ${LOCALBASE}/rancid/${OLDCONFIG_FILE2} ] ; then \ + ${ECHO} "WARNING: *** New CVS Repository will be stored ${LOCALBASE}/rancid/var "; \ ${ECHO} " : *** Copy the repository if you want to keep the history "; \ fi Copied: branches/2016Q4/net-mgmt/rancid3/files/200.rancid.in (from r425092, head/net-mgmt/rancid3/files/200.rancid.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/net-mgmt/rancid3/files/200.rancid.in Tue Nov 1 21:03:32 2016 (r425093, copy of r425092, head/net-mgmt/rancid3/files/200.rancid.in) @@ -0,0 +1,20 @@ +#!/bin/sh + +# If there is a global system configuration file, suck it in. +# +if [ -r /etc/defaults/periodic.conf ]; then + . /etc/defaults/periodic.conf + source_periodic_confs +fi + +# hourly_rancid_enable - Enable hourly rancid run (values: YES | NO) + +case "${hourly_rancid_enable-"NO"}" in + [Yy][Ee][Ss]) + /usr/bin/su -f rancid %%LOCALBASE%%/libexec/rancid/rancid-run + ;; + + *) + exit 0 + ;; +esac Modified: branches/2016Q4/net-mgmt/rancid3/files/pkg-message.in ============================================================================== --- branches/2016Q4/net-mgmt/rancid3/files/pkg-message.in Tue Nov 1 21:02:13 2016 (r425092) +++ branches/2016Q4/net-mgmt/rancid3/files/pkg-message.in Tue Nov 1 21:03:32 2016 (r425093) @@ -9,3 +9,7 @@ you need to install devel/cvsweb or deve For rancid looking-glass copy the actual CGIs (located at %%PREFIX%%/libexec/rancid/{lg.cgi lgform.cgi}) to your cgi-bin. + +Schedule rancid-run with cron at your desired interval or add +hourly_rancid_enable="YES" to /etc/periodic.conf for automatic hourly +runs. Modified: branches/2016Q4/net-mgmt/rancid3/pkg-plist ============================================================================== --- branches/2016Q4/net-mgmt/rancid3/pkg-plist Tue Nov 1 21:02:13 2016 (r425092) +++ branches/2016Q4/net-mgmt/rancid3/pkg-plist Tue Nov 1 21:03:32 2016 (r425093) @@ -1,5 +1,6 @@ bin/rancid-cvs bin/rancid-run +etc/periodic/hourly/200.rancid lib/rancid/acos.pm lib/rancid/arbor.pm lib/rancid/ciscowlc.pm From owner-svn-ports-branches@freebsd.org Wed Nov 2 04:38:37 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D9279C2A201; Wed, 2 Nov 2016 04:38:37 +0000 (UTC) (envelope-from jbeich@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 mx1.freebsd.org (Postfix) with ESMTPS id 5C8561A28; Wed, 2 Nov 2016 04:38:37 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA24caks011534; Wed, 2 Nov 2016 04:38:36 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA24caqB011533; Wed, 2 Nov 2016 04:38:36 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201611020438.uA24caqB011533@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 2 Nov 2016 04:38:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425105 - branches/2016Q4/devel/sfml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Nov 2016 04:38:38 -0000 Author: jbeich Date: Wed Nov 2 04:38:36 2016 New Revision: 425105 URL: https://svnweb.freebsd.org/changeset/ports/425105 Log: MFH: r425104 devel/sfml: unbreak on 9.x via clang cd src/SFML/Audio && /usr/bin/c++ -DFLAC__NO_DLL -DOV_EXCLUDE_STATIC_CALLBACKS -DSFML_AUDIO_EXPORTS -Iinclude -Isrc -I/usr/local/include/AL -I/usr/local/include -O2 -pipe -fno-strict-aliasing -O2 -pipe -fno-strict-aliasing -fPIC -fvisibility=hidden -o CMakeFiles/sfml-audio.dir/SoundFileFactory.cpp.o -c src/SFML/Audio/SoundFileFactory.cpp include/SFML/Audio/SoundFileFactory.inl: In static member function 'static void sf::SoundFileFactory::unregisterReader() [with T = sf::priv::SoundFileReaderFlac]': include/SFML/Audio/SoundFileFactory.inl:43: instantiated from 'static void sf::SoundFileFactory::registerReader() [with T = sf::priv::SoundFileReaderFlac]' src/SFML/Audio/SoundFileFactory.cpp:48: instantiated from here include/SFML/Audio/SoundFileFactory.inl:62: error: address of overloaded function with no contextual type information include/SFML/Audio/SoundFileFactory.inl: In static member function 'static void sf::SoundFileFactory::unregisterWriter() [with T = sf::priv::SoundFileWriterFlac]': include/SFML/Audio/SoundFileFactory.inl:74: instantiated from 'static void sf::SoundFileFactory::registerWriter() [with T = sf::priv::SoundFileWriterFlac]' src/SFML/Audio/SoundFileFactory.cpp:49: instantiated from here include/SFML/Audio/SoundFileFactory.inl:93: error: address of overloaded function with no contextual type information [...] Approved by: portmgr blanket Approved by: ports-secteam blanket Modified: branches/2016Q4/devel/sfml/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/devel/sfml/Makefile ============================================================================== --- branches/2016Q4/devel/sfml/Makefile Wed Nov 2 04:33:05 2016 (r425104) +++ branches/2016Q4/devel/sfml/Makefile Wed Nov 2 04:38:36 2016 (r425105) @@ -19,9 +19,7 @@ LIB_DEPENDS= libFLAC.so:audio/flac \ libvorbis.so:audio/libvorbis \ libxcb-image.so:x11/xcb-util-image -BROKEN_FreeBSD_9= does not build - -USES= cmake dos2unix jpeg openal:al zip:infozip +USES= cmake compiler:c++11-lang dos2unix jpeg openal:al zip:infozip CMAKE_ARGS= -DSFML_INSTALL_PKGCONFIG_FILES=ON DOS2UNIX_FILES= CMakeLists.txt USE_XORG= x11 xcb From owner-svn-ports-branches@freebsd.org Wed Nov 2 05:28:30 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 04669C2A029; Wed, 2 Nov 2016 05:28:30 +0000 (UTC) (envelope-from swills@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 mx1.freebsd.org (Postfix) with ESMTPS id 9C0DB158F; Wed, 2 Nov 2016 05:28:29 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA25SSLk031269; Wed, 2 Nov 2016 05:28:28 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA25SSQH031267; Wed, 2 Nov 2016 05:28:28 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201611020528.uA25SSQH031267@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Wed, 2 Nov 2016 05:28:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425110 - in branches/2016Q4/databases/memcached: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Nov 2016 05:28:30 -0000 Author: swills Date: Wed Nov 2 05:28:28 2016 New Revision: 425110 URL: https://svnweb.freebsd.org/changeset/ports/425110 Log: MFH: r425108 databases/memcached: Update to version 1.4.33 PR: 213416 Submitted by: luca.pizzamiglio@gmail.com (with modifications) Relnotes: https://github.com/memcached/memcached/wiki/ReleaseNotes1433 Security: f4bf713f-6ac7-4b76-8980-47bf90c5419f Approved by: portmgr (swills) Deleted: branches/2016Q4/databases/memcached/files/patch-thread.c Modified: branches/2016Q4/databases/memcached/Makefile branches/2016Q4/databases/memcached/distinfo Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/databases/memcached/Makefile ============================================================================== --- branches/2016Q4/databases/memcached/Makefile Wed Nov 2 05:27:38 2016 (r425109) +++ branches/2016Q4/databases/memcached/Makefile Wed Nov 2 05:28:28 2016 (r425110) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= memcached -PORTVERSION= 1.4.25 +PORTVERSION= 1.4.33 CATEGORIES= databases MASTER_SITES= http://www.memcached.org/files/ \ GENTOO @@ -27,8 +27,7 @@ SASL_DESC= Enable SASL Authentication USE_RC_SUBR= memcached SUB_LIST+= RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX} -USES= cpe shebangfix autoreconf:build -USE_AUTOTOOLS= aclocal +USES= cpe shebangfix autoreconf SHEBANG_FILES= scripts/memcached-tool USE_CSTD= c99 @@ -37,6 +36,8 @@ CONFIGURE_ARGS= --with-libevent=${LOCALB --program-prefix= \ --disable-coverage +DOCS_BUILD_DEPENDS= xml2rfc:textproc/xml2rfc + DTRACE_CONFIGURE_ENABLE= dtrace SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 @@ -57,19 +58,15 @@ CONFIGURE_ARGS+= --enable-64bit BROKEN= DTRACE broken with gcc/clang - reported upstream .endif -.if ${PORT_OPTIONS:MDOCS} -BUILD_DEPENDS= xml2rfc:textproc/xml2rfc -.endif - post-install: ${INSTALL_SCRIPT} ${WRKSRC}/scripts/memcached-tool ${STAGEDIR}${PREFIX}/bin -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} + +post-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in protocol-binary-range.txt protocol-binary.txt protocol.txt \ readme.txt threads.txt ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR} .endfor -.endif regression-test: test test: build Modified: branches/2016Q4/databases/memcached/distinfo ============================================================================== --- branches/2016Q4/databases/memcached/distinfo Wed Nov 2 05:27:38 2016 (r425109) +++ branches/2016Q4/databases/memcached/distinfo Wed Nov 2 05:28:28 2016 (r425110) @@ -1,2 +1,3 @@ -SHA256 (memcached-1.4.25.tar.gz) = f058437b3c224d321919a9a6bb4e3eedb2312ed718c0caf087ff2f04ab795dda -SIZE (memcached-1.4.25.tar.gz) = 359709 +TIMESTAMP = 1478061979 +SHA256 (memcached-1.4.33.tar.gz) = 83726c8d68258c56712373072abb25a449c257398075a39ec0867fd8ba69771d +SIZE (memcached-1.4.33.tar.gz) = 389813 From owner-svn-ports-branches@freebsd.org Wed Nov 2 06:05:19 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EE68AC2A994; Wed, 2 Nov 2016 06:05:19 +0000 (UTC) (envelope-from jbeich@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 mx1.freebsd.org (Postfix) with ESMTPS id 58A71108B; Wed, 2 Nov 2016 06:05:19 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA265I2r046773; Wed, 2 Nov 2016 06:05:18 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA265ISL046772; Wed, 2 Nov 2016 06:05:18 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201611020605.uA265ISL046772@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 2 Nov 2016 06:05:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425113 - branches/2016Q4/graphics/libboard X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Nov 2016 06:05:20 -0000 Author: jbeich Date: Wed Nov 2 06:05:18 2016 New Revision: 425113 URL: https://svnweb.freebsd.org/changeset/ports/425113 Log: MFH: r425112 graphics/libboard: unbreak on 9.x src/Tools.cpp: In function 'const char* LibBoard::Tools::temporaryFilename(const char*)': src/Tools.cpp:204: error: 'snprintf' is not a member of 'std' Reported by: pkg-fallout Approved by: portmgr blanket Approved by: ports-secteam blanket Modified: branches/2016Q4/graphics/libboard/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/graphics/libboard/Makefile ============================================================================== --- branches/2016Q4/graphics/libboard/Makefile Wed Nov 2 05:57:27 2016 (r425112) +++ branches/2016Q4/graphics/libboard/Makefile Wed Nov 2 06:05:18 2016 (r425113) @@ -14,6 +14,7 @@ BUILD_DEPENDS= doxygen:devel/doxygen LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick HAS_CONFIGURE= yes +CXXFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528 CONFIGURE_ARGS= --prefix=${PREFIX} CONFIGURE_ENV= CXX=${CXX} From owner-svn-ports-branches@freebsd.org Wed Nov 2 06:40:00 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 76C3DC2B449; Wed, 2 Nov 2016 06:40:00 +0000 (UTC) (envelope-from delphij@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 mx1.freebsd.org (Postfix) with ESMTPS id 90DA11163; Wed, 2 Nov 2016 06:39:59 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA26dwei059182; Wed, 2 Nov 2016 06:39:58 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA26dvMS059172; Wed, 2 Nov 2016 06:39:57 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201611020639.uA26dvMS059172@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 2 Nov 2016 06:39:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425116 - in branches/2016Q4/dns: bind910 bind910/files bind911 bind911/files bind99 bind99/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Nov 2016 06:40:00 -0000 Author: delphij Date: Wed Nov 2 06:39:57 2016 New Revision: 425116 URL: https://svnweb.freebsd.org/changeset/ports/425116 Log: MFH: r425115 Security update: dns/bind99: 9.9.9-P3 -> 9.9.9-P4 dns/bind910: 9.10.4-P3 -> 9.10.4-P4 dns/bind911: 9.11.0 -> 9.11.0-P1 Security: CVE-2016-8864 Submitted by: mat Approved by: ports-secteam Modified: branches/2016Q4/dns/bind910/Makefile branches/2016Q4/dns/bind910/distinfo branches/2016Q4/dns/bind910/files/extrapatch-bind-min-override-ttl branches/2016Q4/dns/bind911/Makefile branches/2016Q4/dns/bind911/distinfo branches/2016Q4/dns/bind911/files/extrapatch-bind-min-override-ttl branches/2016Q4/dns/bind99/Makefile branches/2016Q4/dns/bind99/distinfo branches/2016Q4/dns/bind99/files/extrapatch-bind-min-override-ttl Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/dns/bind910/Makefile ============================================================================== --- branches/2016Q4/dns/bind910/Makefile Wed Nov 2 06:38:48 2016 (r425115) +++ branches/2016Q4/dns/bind910/Makefile Wed Nov 2 06:39:57 2016 (r425116) @@ -29,7 +29,7 @@ COMMENT= BIND DNS suite with updated DNS LICENSE= ISCL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.10.4-P3 +ISCVERSION= 9.10.4-P4 USES= cpe libedit Modified: branches/2016Q4/dns/bind910/distinfo ============================================================================== --- branches/2016Q4/dns/bind910/distinfo Wed Nov 2 06:38:48 2016 (r425115) +++ branches/2016Q4/dns/bind910/distinfo Wed Nov 2 06:39:57 2016 (r425116) @@ -1,3 +1,3 @@ -TIMESTAMP = 1474631813 -SHA256 (bind-9.10.4-P3.tar.gz) = a075e5ce89fddccb0e64d1777d59161387dd5151cf4e7d1a93875a487812baef -SIZE (bind-9.10.4-P3.tar.gz) = 9299078 +TIMESTAMP = 1477663379 +SHA256 (bind-9.10.4-P4.tar.gz) = a41ce7518e1d0faa40312cc89f4ca42246906b2718099d992e87a5d3ce9a9d86 +SIZE (bind-9.10.4-P4.tar.gz) = 9299638 Modified: branches/2016Q4/dns/bind910/files/extrapatch-bind-min-override-ttl ============================================================================== --- branches/2016Q4/dns/bind910/files/extrapatch-bind-min-override-ttl Wed Nov 2 06:38:48 2016 (r425115) +++ branches/2016Q4/dns/bind910/files/extrapatch-bind-min-override-ttl Wed Nov 2 06:39:57 2016 (r425116) @@ -1,4 +1,4 @@ ---- bin/named/config.c.orig 2016-04-20 20:11:20 UTC +--- bin/named/config.c.orig 2016-10-21 05:10:54 UTC +++ bin/named/config.c @@ -151,6 +151,8 @@ options {\n\ min-roots 2;\n\ @@ -9,7 +9,7 @@ max-cache-ttl 604800; /* 1 week */\n\ transfer-format many-answers;\n\ max-cache-size 0;\n\ ---- bin/named/server.c.orig 2016-04-20 20:11:20 UTC +--- bin/named/server.c.orig 2016-10-21 05:10:54 UTC +++ bin/named/server.c @@ -2802,6 +2802,16 @@ configure_view(dns_view_t *view, dns_vie } @@ -28,7 +28,7 @@ result = ns_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asuint32(obj); ---- lib/dns/include/dns/view.h.orig 2016-04-20 20:11:20 UTC +--- lib/dns/include/dns/view.h.orig 2016-10-21 05:10:54 UTC +++ lib/dns/include/dns/view.h @@ -150,6 +150,8 @@ struct dns_view { isc_boolean_t requestnsid; @@ -39,9 +39,9 @@ dns_ttl_t maxncachettl; dns_ttl_t prefetch_trigger; dns_ttl_t prefetch_eligible; ---- lib/dns/resolver.c.orig 2016-04-20 20:11:20 UTC +--- lib/dns/resolver.c.orig 2016-10-21 05:10:54 UTC +++ lib/dns/resolver.c -@@ -5371,6 +5371,18 @@ cache_name(fetchctx_t *fctx, dns_name_t +@@ -5373,6 +5373,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } /* @@ -60,7 +60,7 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) ---- lib/isccfg/namedconf.c.orig 2016-04-20 20:11:20 UTC +--- lib/isccfg/namedconf.c.orig 2016-10-21 05:10:54 UTC +++ lib/isccfg/namedconf.c @@ -1572,6 +1572,8 @@ view_clauses[] = { #endif Modified: branches/2016Q4/dns/bind911/Makefile ============================================================================== --- branches/2016Q4/dns/bind911/Makefile Wed Nov 2 06:38:48 2016 (r425115) +++ branches/2016Q4/dns/bind911/Makefile Wed Nov 2 06:39:57 2016 (r425116) @@ -29,7 +29,7 @@ COMMENT= BIND DNS suite with updated DNS LICENSE= MPL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.11.0 +ISCVERSION= 9.11.0-P1 USES= cpe libedit Modified: branches/2016Q4/dns/bind911/distinfo ============================================================================== --- branches/2016Q4/dns/bind911/distinfo Wed Nov 2 06:38:48 2016 (r425115) +++ branches/2016Q4/dns/bind911/distinfo Wed Nov 2 06:39:57 2016 (r425116) @@ -1,3 +1,3 @@ -TIMESTAMP = 1475620351 -SHA256 (bind-9.11.0.tar.gz) = 6f0b403036e0281b272a0fbdd0dc3417f3050b625cb059c5409432611418058b -SIZE (bind-9.11.0.tar.gz) = 9789272 +TIMESTAMP = 1477663452 +SHA256 (bind-9.11.0-P1.tar.gz) = 094cd3134ba1b44f0910de1334f05a7dca68d583da038de40a8ad7a0cb1592c6 +SIZE (bind-9.11.0-P1.tar.gz) = 9673074 Modified: branches/2016Q4/dns/bind911/files/extrapatch-bind-min-override-ttl ============================================================================== --- branches/2016Q4/dns/bind911/files/extrapatch-bind-min-override-ttl Wed Nov 2 06:38:48 2016 (r425115) +++ branches/2016Q4/dns/bind911/files/extrapatch-bind-min-override-ttl Wed Nov 2 06:39:57 2016 (r425116) @@ -1,4 +1,4 @@ ---- bin/named/config.c.orig 2016-08-30 11:01:49 UTC +--- bin/named/config.c.orig 2016-10-21 05:13:38 UTC +++ bin/named/config.c @@ -154,6 +154,8 @@ options {\n\ lame-ttl 600;\n\ @@ -9,9 +9,9 @@ max-cache-ttl 604800; /* 1 week */\n\ transfer-format many-answers;\n\ max-cache-size 90%;\n\ ---- bin/named/server.c.orig 2016-08-30 11:01:49 UTC +--- bin/named/server.c.orig 2016-10-21 05:13:38 UTC +++ bin/named/server.c -@@ -3637,6 +3637,16 @@ configure_view(dns_view_t *view, dns_vie +@@ -3638,6 +3638,16 @@ configure_view(dns_view_t *view, dns_vie } obj = NULL; @@ -28,7 +28,7 @@ result = ns_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asuint32(obj); ---- lib/dns/include/dns/view.h.orig 2016-08-30 11:01:49 UTC +--- lib/dns/include/dns/view.h.orig 2016-10-21 05:13:38 UTC +++ lib/dns/include/dns/view.h @@ -146,6 +146,8 @@ struct dns_view { isc_boolean_t requestnsid; @@ -39,9 +39,9 @@ dns_ttl_t maxncachettl; isc_uint32_t nta_lifetime; isc_uint32_t nta_recheck; ---- lib/dns/resolver.c.orig 2016-08-30 11:01:49 UTC +--- lib/dns/resolver.c.orig 2016-10-21 05:13:38 UTC +++ lib/dns/resolver.c -@@ -5431,6 +5431,18 @@ cache_name(fetchctx_t *fctx, dns_name_t +@@ -5433,6 +5433,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } /* @@ -60,7 +60,7 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) ---- lib/isccfg/namedconf.c.orig 2016-08-30 11:01:49 UTC +--- lib/isccfg/namedconf.c.orig 2016-10-21 05:13:38 UTC +++ lib/isccfg/namedconf.c @@ -1735,6 +1735,8 @@ view_clauses[] = { { "nosit-udp-size", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE }, Modified: branches/2016Q4/dns/bind99/Makefile ============================================================================== --- branches/2016Q4/dns/bind99/Makefile Wed Nov 2 06:38:48 2016 (r425115) +++ branches/2016Q4/dns/bind99/Makefile Wed Nov 2 06:39:57 2016 (r425116) @@ -15,7 +15,7 @@ COMMENT= BIND DNS suite with updated DNS LICENSE= ISCL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.9.9-P3 +ISCVERSION= 9.9.9-P4 USES= cpe libedit Modified: branches/2016Q4/dns/bind99/distinfo ============================================================================== --- branches/2016Q4/dns/bind99/distinfo Wed Nov 2 06:38:48 2016 (r425115) +++ branches/2016Q4/dns/bind99/distinfo Wed Nov 2 06:39:57 2016 (r425116) @@ -1,5 +1,5 @@ -TIMESTAMP = 1474632756 -SHA256 (bind-9.9.9-P3.tar.gz) = d63befc221e305bc5cadf9018535e533ebb5a99dd8df69acf42191ecb58991e2 -SIZE (bind-9.9.9-P3.tar.gz) = 8764358 -SHA256 (9.9.9-P3-rpz2+rl.14038.05.patch.xz) = fffc64517aeabd0a9d51243e98b2fad725f98641cfa19e469c0a7b46e6bbc3c0 -SIZE (9.9.9-P3-rpz2+rl.14038.05.patch.xz) = 39308 +TIMESTAMP = 1477663203 +SHA256 (bind-9.9.9-P4.tar.gz) = fdd5120aea9bf5147c350fb2460bfe79c3f1bcc36baa863aee4e1a9de910f1e2 +SIZE (bind-9.9.9-P4.tar.gz) = 8764378 +SHA256 (9.9.9-P4-rpz2+rl.14038.05.patch.xz) = 6cc256dfc7895c9e3eac72465b43deaaba0a01e9f97c492eefc4fe4d80fac4aa +SIZE (9.9.9-P4-rpz2+rl.14038.05.patch.xz) = 39308 Modified: branches/2016Q4/dns/bind99/files/extrapatch-bind-min-override-ttl ============================================================================== --- branches/2016Q4/dns/bind99/files/extrapatch-bind-min-override-ttl Wed Nov 2 06:38:48 2016 (r425115) +++ branches/2016Q4/dns/bind99/files/extrapatch-bind-min-override-ttl Wed Nov 2 06:39:57 2016 (r425116) @@ -1,4 +1,4 @@ ---- bin/named/config.c.orig 2016-04-20 20:11:30 UTC +--- bin/named/config.c.orig 2016-10-21 05:12:02 UTC +++ bin/named/config.c @@ -141,6 +141,8 @@ options {\n\ min-roots 2;\n\ @@ -9,7 +9,7 @@ max-cache-ttl 604800; /* 1 week */\n\ transfer-format many-answers;\n\ max-cache-size 0;\n\ ---- bin/named/server.c.orig 2016-04-20 20:11:30 UTC +--- bin/named/server.c.orig 2016-10-21 05:12:02 UTC +++ bin/named/server.c @@ -2559,6 +2559,16 @@ configure_view(dns_view_t *view, cfg_obj } @@ -28,7 +28,7 @@ result = ns_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asuint32(obj); ---- lib/dns/include/dns/view.h.orig 2016-04-20 20:11:30 UTC +--- lib/dns/include/dns/view.h.orig 2016-10-21 05:12:02 UTC +++ lib/dns/include/dns/view.h @@ -148,6 +148,8 @@ struct dns_view { isc_boolean_t provideixfr; @@ -39,9 +39,9 @@ dns_ttl_t maxncachettl; in_port_t dstport; dns_aclenv_t aclenv; ---- lib/dns/resolver.c.orig 2016-04-20 20:11:30 UTC +--- lib/dns/resolver.c.orig 2016-10-21 05:12:02 UTC +++ lib/dns/resolver.c -@@ -5114,6 +5114,18 @@ cache_name(fetchctx_t *fctx, dns_name_t +@@ -5116,6 +5116,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } /* @@ -60,7 +60,7 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) ---- lib/isccfg/namedconf.c.orig 2016-04-20 20:11:30 UTC +--- lib/isccfg/namedconf.c.orig 2016-10-21 05:12:02 UTC +++ lib/isccfg/namedconf.c @@ -1459,6 +1459,8 @@ view_clauses[] = { { "lame-ttl", &cfg_type_uint32, 0 }, From owner-svn-ports-branches@freebsd.org Wed Nov 2 12:21:41 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C1348C2956F; Wed, 2 Nov 2016 12:21:41 +0000 (UTC) (envelope-from jbeich@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 mx1.freebsd.org (Postfix) with ESMTPS id 5C4CF15CC; Wed, 2 Nov 2016 12:21:41 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA2CLe70093868; Wed, 2 Nov 2016 12:21:40 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA2CLegc093867; Wed, 2 Nov 2016 12:21:40 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201611021221.uA2CLegc093867@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 2 Nov 2016 12:21:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425144 - branches/2016Q4/x11-wm/herbstluftwm X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Nov 2016 12:21:42 -0000 Author: jbeich Date: Wed Nov 2 12:21:40 2016 New Revision: 425144 URL: https://svnweb.freebsd.org/changeset/ports/425144 Log: MFH: r425143 x11-wm/herbstluftwm: track more dependencies PR: 213975 Submitted by: Zsolt Udvari (maintainer) Approved by: ports-secteam blanket Modified: branches/2016Q4/x11-wm/herbstluftwm/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/x11-wm/herbstluftwm/Makefile ============================================================================== --- branches/2016Q4/x11-wm/herbstluftwm/Makefile Wed Nov 2 12:17:46 2016 (r425143) +++ branches/2016Q4/x11-wm/herbstluftwm/Makefile Wed Nov 2 12:21:40 2016 (r425144) @@ -10,9 +10,9 @@ COMMENT= Manual tiling window manager fo LICENSE= BSD2CLAUSE -USES= compiler:c++11-lib gmake pkgconfig shebangfix +USES= compiler:c++11-lib gettext-runtime gmake pkgconfig shebangfix SHEBANG_FILES= scripts/*.sh share/autostart share/*.sh -USE_XORG= x11 xinerama +USE_XORG= x11 xext xinerama USE_GNOME= glib20 MAKE_ARGS= PREFIX=${PREFIX} SYSCONFDIR=${PREFIX}/etc \ From owner-svn-ports-branches@freebsd.org Wed Nov 2 13:34:28 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 47B10C2B095; Wed, 2 Nov 2016 13:34:28 +0000 (UTC) (envelope-from feld@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 mx1.freebsd.org (Postfix) with ESMTPS id ECF4410A2; Wed, 2 Nov 2016 13:34:27 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA2DYRl7023959; Wed, 2 Nov 2016 13:34:27 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA2DYQGA023956; Wed, 2 Nov 2016 13:34:26 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201611021334.uA2DYQGA023956@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 2 Nov 2016 13:34:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425154 - branches/2016Q4/ftp/curl X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Nov 2016 13:34:28 -0000 Author: feld Date: Wed Nov 2 13:34:26 2016 New Revision: 425154 URL: https://svnweb.freebsd.org/changeset/ports/425154 Log: MFH: r425153 ftp/curl: Update to 7.51.0 - Update to 7.51.0 - Fixes 11 security vulnerabilities - Remove docs no longer installed from plist PR: 214000 Security: 765feb7d-a0d1-11e6-a881-b499baebfeaf Security: CVE-2016-8615 Security: CVE-2016-8616 Security: CVE-2016-8617 Security: CVE-2016-8618 Security: CVE-2016-8619 Security: CVE-2016-8620 Security: CVE-2016-8621 Security: CVE-2016-8622 Security: CVE-2016-8623 Security: CVE-2016-8624 Security: CVE-2016-8625 Approved by: ports-secteam (with hat) Modified: branches/2016Q4/ftp/curl/Makefile branches/2016Q4/ftp/curl/distinfo branches/2016Q4/ftp/curl/pkg-plist Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/ftp/curl/Makefile ============================================================================== --- branches/2016Q4/ftp/curl/Makefile Wed Nov 2 13:30:47 2016 (r425153) +++ branches/2016Q4/ftp/curl/Makefile Wed Nov 2 13:34:26 2016 (r425154) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= curl -PORTVERSION= 7.50.3 +PORTVERSION= 7.51.0 CATEGORIES= ftp www MASTER_SITES= http://curl.haxx.se/download/ \ LOCAL/sunpoet @@ -61,14 +61,12 @@ PORTEXAMPLES= * CPE_VENDOR= haxx -DOCS= BINDINGS BUGS CODE_OF_CONDUCT.md CODE_STYLE.md CONTRIBUTE.md FAQ \ +DOCS= BUGS CODE_OF_CONDUCT.md CODE_STYLE.md CONTRIBUTE.md FAQ \ FEATURES HISTORY.md HTTP-COOKIES.md HTTP2.md INSTALL \ - INSTALL.devcpp INTERNALS.md KNOWN_BUGS LICENSE-MIXING.md \ + INTERNALS.md KNOWN_BUGS LICENSE-MIXING.md \ MAIL-ETIQUETTE MANUAL RELEASE-PROCEDURE RESOURCES ROADMAP.md \ SECURITY.md SSL-PROBLEMS.md SSLCERTS.md THANKS TODO \ - TheArtOfHttpScripting VERSIONS curl-config.html \ - curl-config.pdf curl.html curl.pdf index.html \ - mk-ca-bundle.html mk-ca-bundle.pdf + TheArtOfHttpScripting VERSIONS .endif SHEBANG_FILES= */*.pl @@ -168,7 +166,7 @@ post-install: post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ ${STAGEDIR}${DOCSDIR}/libcurl/ cd ${WRKSRC}/docs/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/ - cd ${WRKSRC}/docs/libcurl/ && ${INSTALL_DATA} ABI *.html *.m4 *.pdf ${STAGEDIR}${DOCSDIR}/libcurl/ + cd ${WRKSRC}/docs/libcurl/ && ${INSTALL_DATA} ABI *.html *.m4 ${STAGEDIR}${DOCSDIR}/libcurl/ post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ Modified: branches/2016Q4/ftp/curl/distinfo ============================================================================== --- branches/2016Q4/ftp/curl/distinfo Wed Nov 2 13:30:47 2016 (r425153) +++ branches/2016Q4/ftp/curl/distinfo Wed Nov 2 13:34:26 2016 (r425154) @@ -1,3 +1,3 @@ -TIMESTAMP = 1474487464 -SHA256 (curl-7.50.3.tar.lzma) = 8c5457e2ecfc38d7e1103bf5e0f87895222340200de9ceefd300c3420698f5ea -SIZE (curl-7.50.3.tar.lzma) = 6003154 +TIMESTAMP = 1478074540 +SHA256 (curl-7.51.0.tar.lzma) = 9eef5f6bbb972ffc631f4c76cfe93161bf5186926133c77267b24f5191700518 +SIZE (curl-7.51.0.tar.lzma) = 2061223 Modified: branches/2016Q4/ftp/curl/pkg-plist ============================================================================== --- branches/2016Q4/ftp/curl/pkg-plist Wed Nov 2 13:30:47 2016 (r425153) +++ branches/2016Q4/ftp/curl/pkg-plist Wed Nov 2 13:34:26 2016 (r425154) @@ -165,6 +165,7 @@ man/man3/CURLOPT_IOCTLFUNCTION.3.gz man/man3/CURLOPT_IPRESOLVE.3.gz man/man3/CURLOPT_ISSUERCERT.3.gz man/man3/CURLOPT_KEYPASSWD.3.gz +man/man3/CURLOPT_KEEP_SENDING_ON_ERROR.3.gz man/man3/CURLOPT_KRBLEVEL.3.gz man/man3/CURLOPT_LOCALPORT.3.gz man/man3/CURLOPT_LOCALPORTRANGE.3.gz From owner-svn-ports-branches@freebsd.org Thu Nov 3 03:53:40 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DDEC6C2CA39; Thu, 3 Nov 2016 03:53:40 +0000 (UTC) (envelope-from lwhsu@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 mx1.freebsd.org (Postfix) with ESMTPS id 6FAC116DC; Thu, 3 Nov 2016 03:53:40 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA33rdH4058075; Thu, 3 Nov 2016 03:53:39 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA33rdcs058071; Thu, 3 Nov 2016 03:53:39 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201611030353.uA33rdcs058071@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Thu, 3 Nov 2016 03:53:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425185 - branches/2016Q4/www/py-django18 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Nov 2016 03:53:41 -0000 Author: lwhsu Date: Thu Nov 3 03:53:39 2016 New Revision: 425185 URL: https://svnweb.freebsd.org/changeset/ports/425185 Log: MFH: r425147 - Update to 1.8.16 Security: cb116651-79db-4c09-93a2-c38f9df46724 Approved by: ports-secteam (feld) Modified: branches/2016Q4/www/py-django18/Makefile branches/2016Q4/www/py-django18/distinfo Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/www/py-django18/Makefile ============================================================================== --- branches/2016Q4/www/py-django18/Makefile Thu Nov 3 02:48:03 2016 (r425184) +++ branches/2016Q4/www/py-django18/Makefile Thu Nov 3 03:53:39 2016 (r425185) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django -PORTVERSION= 1.8.15 +PORTVERSION= 1.8.16 CATEGORIES= www python MASTER_SITES= CHEESESHOP \ https://www.djangoproject.com/m/releases/${PORTVERSION:R}/ Modified: branches/2016Q4/www/py-django18/distinfo ============================================================================== --- branches/2016Q4/www/py-django18/distinfo Thu Nov 3 02:48:03 2016 (r425184) +++ branches/2016Q4/www/py-django18/distinfo Thu Nov 3 03:53:39 2016 (r425185) @@ -1,3 +1,3 @@ -TIMESTAMP = 1475026991 -SHA256 (python/Django-1.8.15.tar.gz) = 863e543ac985d5cfbce09213fa30bc7c802cbdf60d6db8b5f9dab41e1341eacd -SIZE (python/Django-1.8.15.tar.gz) = 7295362 +TIMESTAMP = 1478083062 +SHA256 (python/Django-1.8.16.tar.gz) = 224aaf17a28609707d942deafe6d0a5b382baf22a6f33e4e61c56c62f09081dd +SIZE (python/Django-1.8.16.tar.gz) = 7299872 From owner-svn-ports-branches@freebsd.org Thu Nov 3 03:54:15 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6CD0CC2CA74; Thu, 3 Nov 2016 03:54:15 +0000 (UTC) (envelope-from lwhsu@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 mx1.freebsd.org (Postfix) with ESMTPS id 1429819DE; Thu, 3 Nov 2016 03:54:14 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA33sEfI058237; Thu, 3 Nov 2016 03:54:14 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA33sEV5058235; Thu, 3 Nov 2016 03:54:14 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201611030354.uA33sEV5058235@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Thu, 3 Nov 2016 03:54:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425186 - branches/2016Q4/www/py-django19 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Nov 2016 03:54:15 -0000 Author: lwhsu Date: Thu Nov 3 03:54:13 2016 New Revision: 425186 URL: https://svnweb.freebsd.org/changeset/ports/425186 Log: MFH: r425148 - Update to 1.9.11 Security: cb116651-79db-4c09-93a2-c38f9df46724 Approved by: ports-secteam (feld) Modified: branches/2016Q4/www/py-django19/Makefile branches/2016Q4/www/py-django19/distinfo Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/www/py-django19/Makefile ============================================================================== --- branches/2016Q4/www/py-django19/Makefile Thu Nov 3 03:53:39 2016 (r425185) +++ branches/2016Q4/www/py-django19/Makefile Thu Nov 3 03:54:13 2016 (r425186) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django -PORTVERSION= 1.9.10 +PORTVERSION= 1.9.11 CATEGORIES= www python MASTER_SITES= CHEESESHOP \ https://www.djangoproject.com/m/releases/${PORTVERSION:R}/ Modified: branches/2016Q4/www/py-django19/distinfo ============================================================================== --- branches/2016Q4/www/py-django19/distinfo Thu Nov 3 03:53:39 2016 (r425185) +++ branches/2016Q4/www/py-django19/distinfo Thu Nov 3 03:54:13 2016 (r425186) @@ -1,3 +1,3 @@ -TIMESTAMP = 1475026150 -SHA256 (python/Django-1.9.10.tar.gz) = 5b3a7c9e5a21b487f16b7d52d12aab8806f0b93be1a0fbdc333acc05f515fc00 -SIZE (python/Django-1.9.10.tar.gz) = 7494610 +TIMESTAMP = 1478083057 +SHA256 (python/Django-1.9.11.tar.gz) = dadcfd8b03dfbf472c2d88c12202d9d015af68fb6561099992bc2d91aeab7d9d +SIZE (python/Django-1.9.11.tar.gz) = 7498558 From owner-svn-ports-branches@freebsd.org Thu Nov 3 03:55:30 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A813FC2CADD; Thu, 3 Nov 2016 03:55:30 +0000 (UTC) (envelope-from lwhsu@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 mx1.freebsd.org (Postfix) with ESMTPS id 38E811F9B; Thu, 3 Nov 2016 03:55:30 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA33tTu5058421; Thu, 3 Nov 2016 03:55:29 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA33tT3q058419; Thu, 3 Nov 2016 03:55:29 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201611030355.uA33tT3q058419@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Thu, 3 Nov 2016 03:55:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425187 - branches/2016Q4/www/py-django110 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Nov 2016 03:55:30 -0000 Author: lwhsu Date: Thu Nov 3 03:55:29 2016 New Revision: 425187 URL: https://svnweb.freebsd.org/changeset/ports/425187 Log: MFH: r425149 - Update to 1.10.3 Security: cb116651-79db-4c09-93a2-c38f9df46724 Approved by: ports-secteam (feld) Modified: branches/2016Q4/www/py-django110/Makefile branches/2016Q4/www/py-django110/distinfo Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/www/py-django110/Makefile ============================================================================== --- branches/2016Q4/www/py-django110/Makefile Thu Nov 3 03:54:13 2016 (r425186) +++ branches/2016Q4/www/py-django110/Makefile Thu Nov 3 03:55:29 2016 (r425187) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django -PORTVERSION= 1.10.1 +PORTVERSION= 1.10.3 CATEGORIES= www python MASTER_SITES= CHEESESHOP \ https://www.djangoproject.com/m/releases/${PORTVERSION}/ Modified: branches/2016Q4/www/py-django110/distinfo ============================================================================== --- branches/2016Q4/www/py-django110/distinfo Thu Nov 3 03:54:13 2016 (r425186) +++ branches/2016Q4/www/py-django110/distinfo Thu Nov 3 03:55:29 2016 (r425187) @@ -1,3 +1,3 @@ -TIMESTAMP = 1473148535 -SHA256 (python/Django-1.10.1.tar.gz) = d6e6c5b25cb67f46afd7c82f536529b11981183423dad8932e15bce93d1a24f3 -SIZE (python/Django-1.10.1.tar.gz) = 7700057 +TIMESTAMP = 1478083124 +SHA256 (python/Django-1.10.3.tar.gz) = 6f92f08dee8a1bd7680e098a91bf5acd08b5cdfe74137f695b60fd79f4478c30 +SIZE (python/Django-1.10.3.tar.gz) = 7733727 From owner-svn-ports-branches@freebsd.org Thu Nov 3 21:25:21 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3E4C4C2EEE3; Thu, 3 Nov 2016 21:25:21 +0000 (UTC) (envelope-from jbeich@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 mx1.freebsd.org (Postfix) with ESMTPS id E79381759; Thu, 3 Nov 2016 21:25:20 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA3LPKxn070524; Thu, 3 Nov 2016 21:25:20 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA3LPKw1070523; Thu, 3 Nov 2016 21:25:20 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201611032125.uA3LPKw1070523@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 3 Nov 2016 21:25:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425273 - in branches/2016Q4/x11/xsel-conrad: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Nov 2016 21:25:21 -0000 Author: jbeich Date: Thu Nov 3 21:25:19 2016 New Revision: 425273 URL: https://svnweb.freebsd.org/changeset/ports/425273 Log: MFH: r425189 x11/xsel-conrad: minor fixes - Plug memory leak [1] - Convert to USES=localbase - Drop unused X11 dependencies - Unsilence install commands - Convert DOCS to target helpers - Reorder some lines PR: 212261 Submitted by: Tobias Kortkamp Obtained from: OpenBSD Ports [1] Approved by: maintainer timeout (2 months) Approved by: ports-secteam (feld) Added: branches/2016Q4/x11/xsel-conrad/files/ - copied from r425189, head/x11/xsel-conrad/files/ Modified: branches/2016Q4/x11/xsel-conrad/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/x11/xsel-conrad/Makefile ============================================================================== --- branches/2016Q4/x11/xsel-conrad/Makefile Thu Nov 3 20:34:34 2016 (r425272) +++ branches/2016Q4/x11/xsel-conrad/Makefile Thu Nov 3 21:25:19 2016 (r425273) @@ -3,6 +3,7 @@ PORTNAME= xsel PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://www.vergenet.net/~conrad/software/xsel/download/ PKGNAMESUFFIX= -conrad @@ -17,24 +18,21 @@ LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept CONFLICTS_INSTALL= xsel-[0-9]* -USE_XORG= x11 xext xt xproto ice sm -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lXext -lX11 + +USES= autoreconf localbase +USE_XORG= x11 xt +GNU_CONFIGURE= yes PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz PORTDOCS= ChangeLog README -GNU_CONFIGURE= yes OPTIONS_DEFINE= DOCS -post-patch: - @${REINPLACE_CMD} -e 's|jmp_buf|sigjmp_buf|g' ${WRKSRC}/xsel.c - @${REINPLACE_CMD} -e 's|@X_CFLAGS@|${CFLAGS}|;\ - s|@X_LIBS@|${LDFLAGS}|' ${WRKSRC}/Makefile.in - do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ - @${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1x ${STAGEDIR}${MAN1PREFIX}/man/man1/${PORTNAME}.1 - @${INSTALL} -d ${STAGEDIR}${DOCSDIR}/ - @cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1x ${STAGEDIR}${MAN1PREFIX}/man/man1/${PORTNAME}.1 + +do-install-DOCS-on: + (cd ${WRKSRC} && ${COPYTREE_SHARE} \ + "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) .include From owner-svn-ports-branches@freebsd.org Thu Nov 3 22:28:49 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EE4FAC2D128; Thu, 3 Nov 2016 22:28:49 +0000 (UTC) (envelope-from bapt@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 mx1.freebsd.org (Postfix) with ESMTPS id BFF4615D6; Thu, 3 Nov 2016 22:28:49 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA3MSmrv094155; Thu, 3 Nov 2016 22:28:48 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA3MSmsu094153; Thu, 3 Nov 2016 22:28:48 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201611032228.uA3MSmsu094153@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 3 Nov 2016 22:28:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425276 - branches/2016Q4/ports-mgmt/pkg X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Nov 2016 22:28:50 -0000 Author: bapt Date: Thu Nov 3 22:28:48 2016 New Revision: 425276 URL: https://svnweb.freebsd.org/changeset/ports/425276 Log: Update to 1.8.8 - Fix setting attributes on directories Approved by: portmgr (implicit) Modified: branches/2016Q4/ports-mgmt/pkg/Makefile branches/2016Q4/ports-mgmt/pkg/distinfo Modified: branches/2016Q4/ports-mgmt/pkg/Makefile ============================================================================== --- branches/2016Q4/ports-mgmt/pkg/Makefile Thu Nov 3 22:20:08 2016 (r425275) +++ branches/2016Q4/ports-mgmt/pkg/Makefile Thu Nov 3 22:28:48 2016 (r425276) @@ -1,9 +1,8 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.8.7 +DISTVERSION= 1.8.8 _PKG_VERSION= ${DISTVERSION} -PORTREVISION= 3 CATEGORIES= ports-mgmt MASTER_SITES= \ http://files.etoilebsd.net/${PORTNAME}/ \ Modified: branches/2016Q4/ports-mgmt/pkg/distinfo ============================================================================== --- branches/2016Q4/ports-mgmt/pkg/distinfo Thu Nov 3 22:20:08 2016 (r425275) +++ branches/2016Q4/ports-mgmt/pkg/distinfo Thu Nov 3 22:28:48 2016 (r425276) @@ -1,3 +1,3 @@ -TIMESTAMP = 1467731442 -SHA256 (pkg-1.8.7.tar.xz) = 7ce81f3af63e875bf4e05ab69a00bae788df79ae22beccbf1764dda76a7ccd4f -SIZE (pkg-1.8.7.tar.xz) = 1950148 +TIMESTAMP = 1478211901 +SHA256 (pkg-1.8.8.tar.xz) = 67a856c9a5c5e68791ff8e6bd93bc28ba8d3d4349b12a1f7569f73cb14d02d27 +SIZE (pkg-1.8.8.tar.xz) = 1945340 From owner-svn-ports-branches@freebsd.org Fri Nov 4 00:43:35 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 962ECC2ED1B; Fri, 4 Nov 2016 00:43:35 +0000 (UTC) (envelope-from jbeich@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 mx1.freebsd.org (Postfix) with ESMTPS id 4E1541434; Fri, 4 Nov 2016 00:43:35 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA40hYGb048469; Fri, 4 Nov 2016 00:43:34 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA40hYKn048467; Fri, 4 Nov 2016 00:43:34 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201611040043.uA40hYKn048467@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 4 Nov 2016 00:43:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425283 - branches/2016Q4/games/openra X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Nov 2016 00:43:35 -0000 Author: jbeich Date: Fri Nov 4 00:43:34 2016 New Revision: 425283 URL: https://svnweb.freebsd.org/changeset/ports/425283 Log: MFH: r425282 games/openra: update GeoLite2 to November snapshot fetch: https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.mmdb.gz: size mismatch: expected 1302893, actual 1298653 Approved by: ports-secteam blanket Modified: branches/2016Q4/games/openra/Makefile branches/2016Q4/games/openra/distinfo Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/games/openra/Makefile ============================================================================== --- branches/2016Q4/games/openra/Makefile Fri Nov 4 00:40:15 2016 (r425282) +++ branches/2016Q4/games/openra/Makefile Fri Nov 4 00:43:34 2016 (r425283) @@ -3,7 +3,7 @@ PORTNAME= openra PORTVERSION= 20160508 DISTVERSIONPREFIX= release- -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games # XXX Convert to USES=nuget or package dependencies instead MASTER_SITES= https://nuget.org/api/v2/package/StyleCopPlus.MSBuild/4.7.49.5?dummy=/:StyleCopPlus \ Modified: branches/2016Q4/games/openra/distinfo ============================================================================== --- branches/2016Q4/games/openra/distinfo Fri Nov 4 00:40:15 2016 (r425282) +++ branches/2016Q4/games/openra/distinfo Fri Nov 4 00:43:34 2016 (r425283) @@ -34,7 +34,7 @@ SHA256 (OpenAL-CS.dll.config) = 58eaf46a SIZE (OpenAL-CS.dll.config) = 301 SHA256 (Eluant.dll) = 218c4ea5424b44d746b5343563123beebc652fd9731967dfd49fed071b58df31 SIZE (Eluant.dll) = 71168 -SHA256 (GeoLite2-Country.mmdb.gz) = be007196c155814b9e46f3969d992aca43158b0b8840b747079312c0aafaa530 -SIZE (GeoLite2-Country.mmdb.gz) = 1302893 +SHA256 (GeoLite2-Country.mmdb.gz) = 2be4eae00c562dbab4ea198abbf5f58f575e554eb0b43f1407296d5275c0d929 +SIZE (GeoLite2-Country.mmdb.gz) = 1298653 SHA256 (openra-OpenRA-release-20160508_GH0.tar.gz) = 277f9bf9dbe4e9a0a3b66e6207cfc8dfee41e47b070af59229c50238db5e25ef SIZE (openra-OpenRA-release-20160508_GH0.tar.gz) = 11617816 From owner-svn-ports-branches@freebsd.org Fri Nov 4 05:38:40 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DCDB2C2F1E8; Fri, 4 Nov 2016 05:38:40 +0000 (UTC) (envelope-from jbeich@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 mx1.freebsd.org (Postfix) with ESMTPS id B70151CA5; Fri, 4 Nov 2016 05:38:40 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA45cde7060209; Fri, 4 Nov 2016 05:38:39 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA45cd3j060207; Fri, 4 Nov 2016 05:38:39 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201611040538.uA45cd3j060207@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 4 Nov 2016 05:38:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425288 - in branches/2016Q4/multimedia/pHash: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Nov 2016 05:38:41 -0000 Author: jbeich Date: Fri Nov 4 05:38:39 2016 New Revision: 425288 URL: https://svnweb.freebsd.org/changeset/ports/425288 Log: MFH: r425287 multimedia/pHash: unbreak build with ffmpeg 3.x =================================================== [...] *** Configuring video Hash *** checking whether FFmpeg is present... checking for avcodec_alloc_frame in -lavcodec... no configure: error: *** libavcodec not found. PR: 214178 Approved by: Naram Qashat (maintainer) Approved by: ports-secteam (delphij) Added: branches/2016Q4/multimedia/pHash/files/patch-ffmpeg30 - copied unchanged from r425287, head/multimedia/pHash/files/patch-ffmpeg30 Modified: branches/2016Q4/multimedia/pHash/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/multimedia/pHash/Makefile ============================================================================== --- branches/2016Q4/multimedia/pHash/Makefile Fri Nov 4 04:48:11 2016 (r425287) +++ branches/2016Q4/multimedia/pHash/Makefile Fri Nov 4 05:38:39 2016 (r425288) @@ -3,6 +3,7 @@ PORTNAME= pHash PORTVERSION= 0.9.6 +PORTREVISION= 1 CATEGORIES= multimedia devel MASTER_SITES= http://phash.org/releases/ \ http://www.cyberbotx.com/pHash/ @@ -54,4 +55,8 @@ VIDEO_BUILD_DEPENDS= ${LOCALBASE}/includ VIDEO_RUN_DEPENDS= ${LOCALBASE}/include/CImg.h:graphics/cimg VIDEO_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg +post-patch: +# Avoid USES=autoreconf while keeping configure.ac patch for reference + @${TOUCH} -r ${WRKSRC}/aclocal.m4 ${WRKSRC}/configure.ac + .include Copied: branches/2016Q4/multimedia/pHash/files/patch-ffmpeg30 (from r425287, head/multimedia/pHash/files/patch-ffmpeg30) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/multimedia/pHash/files/patch-ffmpeg30 Fri Nov 4 05:38:39 2016 (r425288, copy of r425287, head/multimedia/pHash/files/patch-ffmpeg30) @@ -0,0 +1,139 @@ +--- configure.orig 2013-04-23 18:48:24 UTC ++++ configure +@@ -16009,9 +16009,9 @@ if test "x$enable_video_hash" != "xno"; + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether FFmpeg is present" >&5 + $as_echo_n "checking whether FFmpeg is present... " >&6; } +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for avcodec_alloc_frame in -lavcodec" >&5 +-$as_echo_n "checking for avcodec_alloc_frame in -lavcodec... " >&6; } +-if ${ac_cv_lib_avcodec_avcodec_alloc_frame+:} false; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for avcodec_decode_video2 in -lavcodec" >&5 ++$as_echo_n "checking for avcodec_decode_video2 in -lavcodec... " >&6; } ++if ${ac_cv_lib_avcodec_avcodec_decode_video2+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -16025,27 +16025,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ + #ifdef __cplusplus + extern "C" + #endif +-char avcodec_alloc_frame (); ++char avcodec_decode_video2 (); + int + main () + { +-return avcodec_alloc_frame (); ++return avcodec_decode_video2 (); + ; + return 0; + } + _ACEOF + if ac_fn_cxx_try_link "$LINENO"; then : +- ac_cv_lib_avcodec_avcodec_alloc_frame=yes ++ ac_cv_lib_avcodec_avcodec_decode_video2=yes + else +- ac_cv_lib_avcodec_avcodec_alloc_frame=no ++ ac_cv_lib_avcodec_avcodec_decode_video2=no + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_avcodec_alloc_frame" >&5 +-$as_echo "$ac_cv_lib_avcodec_avcodec_alloc_frame" >&6; } +-if test "x$ac_cv_lib_avcodec_avcodec_alloc_frame" = xyes; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_avcodec_decode_video2" >&5 ++$as_echo "$ac_cv_lib_avcodec_avcodec_decode_video2" >&6; } ++if test "x$ac_cv_lib_avcodec_avcodec_decode_video2" = xyes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBAVCODEC 1 + _ACEOF +--- configure.ac.orig 2013-04-23 18:47:49 UTC ++++ configure.ac +@@ -122,7 +122,7 @@ fi]) + AC_DEFUN([AC_CHECK_FFMPEG], + [ + AC_MSG_CHECKING([whether FFmpeg is present]) +-AC_CHECK_LIB([avcodec], [avcodec_alloc_frame], [], [AC_MSG_ERROR([ ++AC_CHECK_LIB([avcodec], [avcodec_decode_video2], [], [AC_MSG_ERROR([ + + *** libavcodec not found. + You need FFmpeg. Get it at ])]) +--- src/cimgffmpeg.cpp.orig 2012-11-23 20:58:01 UTC ++++ src/cimgffmpeg.cpp +@@ -39,11 +39,11 @@ void vfinfo_close(VFInfo *vfinfo){ + int ReadFrames(VFInfo *st_info, CImgList *pFrameList, unsigned int low_index, unsigned int hi_index) + { + //target pixel format +- PixelFormat ffmpeg_pixfmt; ++ AVPixelFormat ffmpeg_pixfmt; + if (st_info->pixelformat == 0) +- ffmpeg_pixfmt = PIX_FMT_GRAY8; ++ ffmpeg_pixfmt = AV_PIX_FMT_GRAY8; + else +- ffmpeg_pixfmt = PIX_FMT_RGB24; ++ ffmpeg_pixfmt = AV_PIX_FMT_RGB24; + + st_info->next_index = low_index; + +@@ -100,12 +100,12 @@ int ReadFrames(VFInfo *st_info, CImgList + AVFrame *pFrame; + + // Allocate video frame +- pFrame=avcodec_alloc_frame(); ++ pFrame=av_frame_alloc(); + if (pFrame==NULL) + return -1; + + // Allocate an AVFrame structure +- AVFrame *pConvertedFrame = avcodec_alloc_frame(); ++ AVFrame *pConvertedFrame = av_frame_alloc(); + if(pConvertedFrame==NULL) + return -1; + +@@ -123,7 +123,7 @@ int ReadFrames(VFInfo *st_info, CImgList + int size = 0; + + +- int channels = ffmpeg_pixfmt == PIX_FMT_GRAY8 ? 1 : 3; ++ int channels = ffmpeg_pixfmt == AV_PIX_FMT_GRAY8 ? 1 : 3; + + AVPacket packet; + int result = 1; +@@ -189,11 +189,11 @@ int ReadFrames(VFInfo *st_info, CImgList + + int NextFrames(VFInfo *st_info, CImgList *pFrameList) + { +- PixelFormat ffmpeg_pixfmt; ++ AVPixelFormat ffmpeg_pixfmt; + if (st_info->pixelformat == 0) +- ffmpeg_pixfmt = PIX_FMT_GRAY8; ++ ffmpeg_pixfmt = AV_PIX_FMT_GRAY8; + else +- ffmpeg_pixfmt = PIX_FMT_RGB24; ++ ffmpeg_pixfmt = AV_PIX_FMT_RGB24; + + if (st_info->pFormatCtx == NULL) + { +@@ -254,10 +254,10 @@ int NextFrames(VFInfo *st_info, CImgList + AVFrame *pFrame; + + // Allocate video frame +- pFrame=avcodec_alloc_frame(); ++ pFrame=av_frame_alloc(); + + // Allocate an AVFrame structure +- AVFrame *pConvertedFrame = avcodec_alloc_frame(); ++ AVFrame *pConvertedFrame = av_frame_alloc(); + if(pConvertedFrame==NULL){ + return -1; + } +@@ -287,7 +287,7 @@ int NextFrames(VFInfo *st_info, CImgList + break; + if(packet.stream_index == st_info->videoStream) { + +- int channels = ffmpeg_pixfmt == PIX_FMT_GRAY8 ? 1 : 3; ++ int channels = ffmpeg_pixfmt == AV_PIX_FMT_GRAY8 ? 1 : 3; + AVPacket avpkt; + av_init_packet(&avpkt); + avpkt.data = packet.data; From owner-svn-ports-branches@freebsd.org Fri Nov 4 07:08:40 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6919AC2F498; Fri, 4 Nov 2016 07:08:40 +0000 (UTC) (envelope-from jbeich@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 mx1.freebsd.org (Postfix) with ESMTPS id 428D71C2B; Fri, 4 Nov 2016 07:08:40 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA478dgY094047; Fri, 4 Nov 2016 07:08:39 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA478d87094045; Fri, 4 Nov 2016 07:08:39 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201611040708.uA478d87094045@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 4 Nov 2016 07:08:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425291 - in branches/2016Q4/comms/dabstick-radio: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Nov 2016 07:08:40 -0000 Author: jbeich Date: Fri Nov 4 07:08:39 2016 New Revision: 425291 URL: https://svnweb.freebsd.org/changeset/ports/425291 Log: MFH: r425290 comms/dabstick-radio: unbreak build with ffmpeg 3.x backend/mp2processor-ffmpeg.cpp:49:33: error: use of undeclared identifier 'CODEC_ID_MP1'; did you mean 'AV_CODEC_ID_MP1'? codec = avcodec_find_decoder (CODEC_ID_MP1); ^~~~~~~~~~~~ In file included from backend/mp2processor.cpp:7: backend/mp2processor-ffmpeg.cpp:66:18: error: use of undeclared identifier 'avcodec_alloc_frame' decoded_frame = avcodec_alloc_frame (); ^ backend/mp2processor-ffmpeg.cpp:107:2: error: use of undeclared identifier 'avcodec_get_frame_defaults' avcodec_get_frame_defaults (decoded_frame); ^ PR: 207547 Approved by: ports-secteam blanket Added: branches/2016Q4/comms/dabstick-radio/files/patch-dabreceiver-V2_backend_mp2processor-ffmpeg.cpp - copied unchanged from r425290, head/comms/dabstick-radio/files/patch-dabreceiver-V2_backend_mp2processor-ffmpeg.cpp Modified: branches/2016Q4/comms/dabstick-radio/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/comms/dabstick-radio/Makefile ============================================================================== --- branches/2016Q4/comms/dabstick-radio/Makefile Fri Nov 4 07:05:51 2016 (r425290) +++ branches/2016Q4/comms/dabstick-radio/Makefile Fri Nov 4 07:08:39 2016 (r425291) @@ -3,7 +3,7 @@ PORTNAME= dabstick-radio PORTVERSION= 0.96 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= comms audio hamradio MASTER_SITES= http://www.sdr-j.tk/ \ LOCAL/nox/ Copied: branches/2016Q4/comms/dabstick-radio/files/patch-dabreceiver-V2_backend_mp2processor-ffmpeg.cpp (from r425290, head/comms/dabstick-radio/files/patch-dabreceiver-V2_backend_mp2processor-ffmpeg.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/comms/dabstick-radio/files/patch-dabreceiver-V2_backend_mp2processor-ffmpeg.cpp Fri Nov 4 07:08:39 2016 (r425291, copy of r425290, head/comms/dabstick-radio/files/patch-dabreceiver-V2_backend_mp2processor-ffmpeg.cpp) @@ -0,0 +1,29 @@ +--- dabreceiver-V2/backend/mp2processor-ffmpeg.cpp.orig 2013-05-20 16:11:57 UTC ++++ dabreceiver-V2/backend/mp2processor-ffmpeg.cpp +@@ -46,7 +46,7 @@ int32_t mp2sampleRate (uint8_t *frame) { + + avcodec_register_all (); + av_init_packet (&avpkt); +- codec = avcodec_find_decoder (CODEC_ID_MP1); ++ codec = avcodec_find_decoder (AV_CODEC_ID_MP1); + if (codec == NULL) { + fprintf (stderr, "Codec not found\n"); + return; +@@ -63,7 +63,7 @@ int32_t mp2sampleRate (uint8_t *frame) { + return; + } + +- decoded_frame = avcodec_alloc_frame (); ++ decoded_frame = av_frame_alloc (); + if (decoded_frame == NULL) { + fprintf (stderr, "Could not allocate audioframe\n"); + return; +@@ -104,7 +104,7 @@ int32_t got_frame; + (void)fwrite (MP2frame, sizeof (uint8_t), MP2framebytes, mp2File); + return; + } +- avcodec_get_frame_defaults (decoded_frame); ++ av_frame_unref (decoded_frame); + + avpkt. data = MP2frame; + avpkt. size = MP2framebytes + 20; From owner-svn-ports-branches@freebsd.org Fri Nov 4 07:25:38 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 194FCC2FAD7; Fri, 4 Nov 2016 07:25:38 +0000 (UTC) (envelope-from jbeich@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 mx1.freebsd.org (Postfix) with ESMTPS id E527716CE; Fri, 4 Nov 2016 07:25:37 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA47PbYa001930; Fri, 4 Nov 2016 07:25:37 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA47Padn001928; Fri, 4 Nov 2016 07:25:36 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201611040725.uA47Padn001928@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 4 Nov 2016 07:25:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425293 - in branches/2016Q4/multimedia/2mandvd: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Nov 2016 07:25:38 -0000 Author: jbeich Date: Fri Nov 4 07:25:36 2016 New Revision: 425293 URL: https://svnweb.freebsd.org/changeset/ports/425293 Log: MFH: r425292 multimedia/2mandvd: unbreak build with ffmpeg 3.x videowrapper.cpp:107:40: error: use of undeclared identifier 'PIX_FMT_RGB24'; did you mean 'AV_PIX_FMT_RGB24'? pCodecCtx->height, PIX_FMT_RGB24, SWS_BICUBIC, NULL, ^~~~~~~~~~~~~ videowrapper.cpp:128:19: error: use of undeclared identifier 'avcodec_alloc_frame' pFrameRGB=avcodec_alloc_frame(); ^ PR: 207547 Approved by: ports-secteam blanket Modified: branches/2016Q4/multimedia/2mandvd/Makefile branches/2016Q4/multimedia/2mandvd/files/patch-videowrapper.cpp Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/multimedia/2mandvd/Makefile ============================================================================== --- branches/2016Q4/multimedia/2mandvd/Makefile Fri Nov 4 07:21:57 2016 (r425292) +++ branches/2016Q4/multimedia/2mandvd/Makefile Fri Nov 4 07:25:36 2016 (r425293) @@ -3,7 +3,7 @@ PORTNAME= 2ManDVD PORTVERSION= 1.8.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= http://download.tuxfamily.org/2mandvd/ Modified: branches/2016Q4/multimedia/2mandvd/files/patch-videowrapper.cpp ============================================================================== --- branches/2016Q4/multimedia/2mandvd/files/patch-videowrapper.cpp Fri Nov 4 07:21:57 2016 (r425292) +++ branches/2016Q4/multimedia/2mandvd/files/patch-videowrapper.cpp Fri Nov 4 07:25:36 2016 (r425293) @@ -1,7 +1,6 @@ -diff -urN videowrapper.cpp videowrapper.cpp ---- videowrapper.cpp 2012-06-06 20:25:24.000000000 +1100 -+++ videowrapper.cpp 2013-08-03 10:54:05.426228163 +1100 -@@ -38,7 +38,7 @@ +--- videowrapper.cpp.orig 2013-07-30 11:46:19 UTC ++++ videowrapper.cpp +@@ -38,7 +38,7 @@ void videowrapper::delete_videowrapper() int videowrapper::load_video(QString filename) { // *** OUVERTURE DU FICHIER VIDEO *** @@ -10,7 +9,7 @@ diff -urN videowrapper.cpp videowrapper. if (avformat_open_input(&pFormatCtx,filename.toAscii().data(),NULL,NULL)!=0) { #else -@@ -91,7 +91,7 @@ +@@ -91,7 +91,7 @@ int videowrapper::load_video(QString fil // *** OUVERTURE DU CODEC *** @@ -19,3 +18,31 @@ diff -urN videowrapper.cpp videowrapper. if(avcodec_open(pCodecCtx, pCodec)<0) { #else +@@ -104,11 +104,11 @@ int videowrapper::load_video(QString fil + + img_convert_ctx = sws_getContext(pCodecCtx->width, + pCodecCtx->height, pCodecCtx->pix_fmt, pCodecCtx->width, +- pCodecCtx->height, PIX_FMT_RGB24, SWS_BICUBIC, NULL, ++ pCodecCtx->height, AV_PIX_FMT_RGB24, SWS_BICUBIC, NULL, + NULL, NULL); + + // *** ON DETERMINE LA TAILLE DU BUFFER *** +- numBytes=avpicture_get_size(PIX_FMT_RGB24, pCodecCtx->width, ++ numBytes=avpicture_get_size(AV_PIX_FMT_RGB24, pCodecCtx->width, + pCodecCtx->height); + buffer=(uint8_t *)av_malloc(numBytes*sizeof(uint8_t)); + old_frame = -1; +@@ -125,10 +125,10 @@ QImage videowrapper::read_frame(int64_t + if ( num_frame != old_frame ) + { + // *** ALLOCATE VIDEO FRAME *** +- pFrameRGB=avcodec_alloc_frame(); +- pFrame=avcodec_alloc_frame(); ++ pFrameRGB=av_frame_alloc(); ++ pFrame=av_frame_alloc(); + +- avpicture_fill((AVPicture *)pFrameRGB, buffer, PIX_FMT_RGB24, ++ avpicture_fill((AVPicture *)pFrameRGB, buffer, AV_PIX_FMT_RGB24, + pCodecCtx->width, pCodecCtx->height); + av_seek_frame(pFormatCtx,videoStream,0, AVSEEK_FLAG_FRAME); + compte_frame = -1; From owner-svn-ports-branches@freebsd.org Fri Nov 4 07:40:09 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 83BACC2FF2D; Fri, 4 Nov 2016 07:40:09 +0000 (UTC) (envelope-from jbeich@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 mx1.freebsd.org (Postfix) with ESMTPS id 5F02C12CB; Fri, 4 Nov 2016 07:40:09 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA47e8CD007302; Fri, 4 Nov 2016 07:40:08 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA47e8jR007301; Fri, 4 Nov 2016 07:40:08 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201611040740.uA47e8jR007301@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 4 Nov 2016 07:40:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425300 - branches/2016Q4/audio/libgroove X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Nov 2016 07:40:09 -0000 Author: jbeich Date: Fri Nov 4 07:40:08 2016 New Revision: 425300 URL: https://svnweb.freebsd.org/changeset/ports/425300 Log: MFH: r425298 audio/libgroove: unbreak build with ffmpeg 3.x groove/encoder.c:84:19: error: 'avcodec_encode_audio2' is deprecated [-Werror,-Wdeprecated-declarations] int errcode = avcodec_encode_audio2(e->stream->codec, &e->pkt, frame, &got_packet); ^ /usr/local/include/libavcodec/avcodec.h:5283:5: note: 'avcodec_encode_audio2' has been explicitly marked deprecated here int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt, ^ groove/encoder.c:84:52: error: 'codec' is deprecated [-Werror,-Wdeprecated-declarations] int errcode = avcodec_encode_audio2(e->stream->codec, &e->pkt, frame, &got_packet); ^ /usr/local/include/libavformat/avformat.h:893:21: note: 'codec' has been explicitly marked deprecated here AVCodecContext *codec; ^ groove/encoder.c:94:5: error: 'av_free_packet' is deprecated [-Werror,-Wdeprecated-declarations] av_free_packet(&e->pkt); ^ /usr/local/include/libavcodec/avcodec.h:4472:6: note: 'av_free_packet' has been explicitly marked deprecated here void av_free_packet(AVPacket *pkt); ^ groove/encoder.c:101:34: error: 'codec' is deprecated [-Werror,-Wdeprecated-declarations] avcodec_close(e->stream->codec); ^ /usr/local/include/libavformat/avformat.h:893:21: note: 'codec' has been explicitly marked deprecated here AVCodecContext *codec; ^ groove/encoder.c:134:44: error: 'codec' is deprecated [-Werror,-Wdeprecated-declarations] AVCodecContext *codec_ctx = e->stream->codec; ^ /usr/local/include/libavformat/avformat.h:893:21: note: 'codec' has been explicitly marked deprecated here AVCodecContext *codec; ^ groove/encoder.c:148:16: error: 'codec' is deprecated [-Werror,-Wdeprecated-declarations] e->stream->codec = codec_ctx; ^ /usr/local/include/libavformat/avformat.h:893:21: note: 'codec' has been explicitly marked deprecated here AVCodecContext *codec; ^ groove/encoder.c:620:24: error: 'codec' is deprecated [-Werror,-Wdeprecated-declarations] 0 : e->stream->codec->frame_size; ^ /usr/local/include/libavformat/avformat.h:893:21: note: 'codec' has been explicitly marked deprecated here AVCodecContext *codec; ^ 7 errors generated. PR: 207547 Approved by: ports-secteam blanket Modified: branches/2016Q4/audio/libgroove/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/audio/libgroove/Makefile ============================================================================== --- branches/2016Q4/audio/libgroove/Makefile Fri Nov 4 07:38:09 2016 (r425299) +++ branches/2016Q4/audio/libgroove/Makefile Fri Nov 4 07:40:08 2016 (r425300) @@ -23,6 +23,7 @@ GH_ACCOUNT= andrewrk USES= cmake:outsource USE_SDL= sdl2 USE_LDCONFIG= yes +CFLAGS+= -Wno-error=deprecated-declarations # ffmpeg 3.1 PLIST_SUB+= VER1=${PORTVERSION:R:R} \ VER3=${PORTVERSION} From owner-svn-ports-branches@freebsd.org Fri Nov 4 08:52:21 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 693D0C2DDC6; Fri, 4 Nov 2016 08:52:21 +0000 (UTC) (envelope-from jbeich@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 mx1.freebsd.org (Postfix) with ESMTPS id 3743219EE; Fri, 4 Nov 2016 08:52:21 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA48qKNm040775; Fri, 4 Nov 2016 08:52:20 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA48qKO1040770; Fri, 4 Nov 2016 08:52:20 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201611040852.uA48qKO1040770@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 4 Nov 2016 08:52:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425306 - in branches/2016Q4/x11-toolkits/nucleo: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Nov 2016 08:52:21 -0000 Author: jbeich Date: Fri Nov 4 08:52:19 2016 New Revision: 425306 URL: https://svnweb.freebsd.org/changeset/ports/425306 Log: MFH: r425305 x11-toolkits/nucleo: unbreak build with ffmpeg 3.x In file included from nucleo/plugins/ffmpeg/ffmpegImageSink.cxx:14: nucleo/plugins/ffmpeg/ffmpegImageSink.H:39:10: error: ISO C++ forbids forward references to 'enum' types enum PixelFormat srcEncoding ; ^ nucleo/plugins/ffmpeg/ffmpegImageSink.H:39:22: error: field has incomplete type 'enum PixelFormat' enum PixelFormat srcEncoding ; ^ nucleo/plugins/ffmpeg/ffmpegImageSink.H:39:10: note: forward declaration of 'nucleo::PixelFormat' enum PixelFormat srcEncoding ; ^ nucleo/plugins/ffmpeg/ffmpegImageSink.cxx:131:44: error: use of undeclared identifier 'CODEC_ID_NONE'; did you mean 'AV_CODEC_ID_NONE'? else if (output_format->video_codec == CODEC_ID_NONE) { ^~~~~~~~~~~~~ AV_CODEC_ID_NONE /usr/local/include/libavcodec/avcodec.h:192:5: note: 'AV_CODEC_ID_NONE' declared here AV_CODEC_ID_NONE, ^ nucleo/plugins/ffmpeg/ffmpegImageSource.cxx:132:8: error: use of undeclared identifier 'PIX_FMT_GRAY8'; did you mean 'AV_PIX_FMT_GRAY8'? case PIX_FMT_GRAY8: ^~~~~~~~~~~~~ AV_PIX_FMT_GRAY8 /usr/local/include/libavutil/pixfmt.h:70:5: note: 'AV_PIX_FMT_GRAY8' declared here AV_PIX_FMT_GRAY8, ///< Y , 8bpp ^ nucleo/plugins/ffmpeg/ffmpegImageSink.cxx:265:34: error: use of undeclared identifier 'PIX_FMT_GRAY8'; did you mean 'AV_PIX_FMT_GRAY8'? case Image::L: srcEncoding = PIX_FMT_GRAY8 ; break ; ^~~~~~~~~~~~~ AV_PIX_FMT_GRAY8 /usr/local/include/libavutil/pixfmt.h:70:5: note: 'AV_PIX_FMT_GRAY8' declared here AV_PIX_FMT_GRAY8, ///< Y , 8bpp ^ nucleo/plugins/ffmpeg/ffmpegImageSink.cxx:266:42: error: use of undeclared identifier 'PIX_FMT_YUV420P'; did you mean 'AV_PIX_FMT_YUV420P'? case Image::YpCbCr420: srcEncoding = PIX_FMT_YUV420P ; break ; ^~~~~~~~~~~~~~~ AV_PIX_FMT_YUV420P /usr/local/include/libavutil/pixfmt.h:62:5: note: 'AV_PIX_FMT_YUV420P' declared here AV_PIX_FMT_YUV420P, ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples) ^ nucleo/plugins/ffmpeg/ffmpegImageSink.cxx:267:28: error: use of undeclared identifier 'PIX_FMT_RGB24'; did you mean 'AV_PIX_FMT_RGB24'? default: srcEncoding = PIX_FMT_RGB24 ; break ; ^~~~~~~~~~~~~ AV_PIX_FMT_RGB24 /usr/local/include/libavutil/pixfmt.h:64:5: note: 'AV_PIX_FMT_RGB24' declared here AV_PIX_FMT_RGB24, ///< packed RGB 8:8:8, 24bpp, RGBRGB... ^ nucleo/plugins/ffmpeg/ffmpegImageSink.cxx:270:5: error: use of undeclared identifier 'avcodec_get_frame_defaults' avcodec_get_frame_defaults(&srcPic) ; ^ nucleo/plugins/ffmpeg/ffmpegImageSink.cxx:274:3: error: use of undeclared identifier 'avcodec_get_frame_defaults' avcodec_get_frame_defaults(&convPic) ; ^ nucleo/plugins/ffmpeg/ffmpegImageSink.cxx:303:22: error: use of undeclared identifier 'PIX_FMT_RGB24'; did you mean 'AV_PIX_FMT_RGB24'? if (srcEncoding==PIX_FMT_RGB24) convertImage(img, Image::RGB) ; ^~~~~~~~~~~~~ AV_PIX_FMT_RGB24 /usr/local/include/libavutil/pixfmt.h:64:5: note: 'AV_PIX_FMT_RGB24' declared here AV_PIX_FMT_RGB24, ///< packed RGB 8:8:8, 24bpp, RGBRGB... ^ nucleo/plugins/ffmpeg/ffmpegImageSink.cxx:329:20: error: use of undeclared identifier 'avcodec_encode_video'; did you mean 'avcodec_encode_video2'? int out_size = avcodec_encode_video(cctx, video_outbuf, video_outbuf_size, picture) ; ^~~~~~~~~~~~~~~~~~~~ avcodec_encode_video2 /usr/local/include/libavcodec/avcodec.h:5322:5: note: 'avcodec_encode_video2' declared here int avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt, ^ nucleo/plugins/ffmpeg/ffmpegImageSink.cxx:329:47: error: cannot initialize a parameter of type 'AVPacket *' with an lvalue of type 'uint8_t *' (aka 'unsigned char *') int out_size = avcodec_encode_video(cctx, video_outbuf, video_outbuf_size, picture) ; ^~~~~~~~~~~~ /usr/local/include/libavcodec/avcodec.h:5322:60: note: passing argument to parameter 'avpkt' here int avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt, ^ PR: 207547 Approved by: ports-secteam blanket Added: branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo_plugins_ffmpeg_ffmpegImageSink.H - copied unchanged from r425305, head/x11-toolkits/nucleo/files/patch-nucleo_plugins_ffmpeg_ffmpegImageSink.H Modified: branches/2016Q4/x11-toolkits/nucleo/Makefile branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSink.cxx branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSource.cxx Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/x11-toolkits/nucleo/Makefile ============================================================================== --- branches/2016Q4/x11-toolkits/nucleo/Makefile Fri Nov 4 08:48:49 2016 (r425305) +++ branches/2016Q4/x11-toolkits/nucleo/Makefile Fri Nov 4 08:52:19 2016 (r425306) @@ -3,7 +3,7 @@ PORTNAME= nucleo PORTVERSION= 0.7.6 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= x11-toolkits MASTER_SITES= http://insitu.lri.fr/metisse/download/nucleo/ Modified: branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSink.cxx ============================================================================== --- branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSink.cxx Fri Nov 4 08:48:49 2016 (r425305) +++ branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSink.cxx Fri Nov 4 08:52:19 2016 (r425306) @@ -1,6 +1,6 @@ ---- nucleo/plugins/ffmpeg/ffmpegImageSink.cxx.orig 2009-05-25 14:53:15.000000000 +0200 -+++ nucleo/plugins/ffmpeg/ffmpegImageSink.cxx 2015-07-03 23:24:23.255152399 +0200 -@@ -118,11 +118,11 @@ namespace nucleo { +--- nucleo/plugins/ffmpeg/ffmpegImageSink.cxx.orig 2009-05-25 12:53:15 UTC ++++ nucleo/plugins/ffmpeg/ffmpegImageSink.cxx +@@ -118,17 +118,17 @@ namespace nucleo { output_format = 0 ; if (uri.scheme=="mpegts-udp") { @@ -15,6 +15,13 @@ } std::string message ; + if (!output_format) + message = "Unable to find the requested format" ; +- else if (output_format->video_codec == CODEC_ID_NONE) { ++ else if (output_format->video_codec == AV_CODEC_ID_NONE) { + output_format = 0 ; + message = "Not a video format" ; + } else if (output_format->flags & AVFMT_NOFILE) { @@ -156,12 +156,13 @@ namespace nucleo { snprintf(format_context->filename, sizeof(format_context->filename), "%s", filename.c_str()) ; @@ -30,15 +37,17 @@ // ---------------- -@@ -190,7 +191,7 @@ namespace nucleo { +@@ -190,8 +191,8 @@ namespace nucleo { AVCodecContext *codec_context = vstream->codec ; codec_context->codec_id = output_format->video_codec ; - codec_context->codec_type = CODEC_TYPE_VIDEO ; +- codec_context->pix_fmt = PIX_FMT_YUV420P ; + codec_context->codec_type = AVMEDIA_TYPE_VIDEO ; - codec_context->pix_fmt = PIX_FMT_YUV420P ; ++ codec_context->pix_fmt = AV_PIX_FMT_YUV420P ; codec_context->width = img->getWidth() ; // must be a multiple of two codec_context->height = img->getHeight() ; // must be a multiple of two + codec_context->me_method = ME_EPZS ; // ME_ZERO @@ -210,12 +211,7 @@ namespace nucleo { || !strcmp(format_context->oformat->name, "3gp")) codec_context->flags |= CODEC_FLAG_GLOBAL_HEADER ; @@ -71,7 +80,7 @@ std::cerr << "ffmpegImageSink: could not open " << filename << std::endl ; return false ; } -@@ -245,17 +241,17 @@ namespace nucleo { +@@ -245,37 +241,37 @@ namespace nucleo { int port = uri.port ; if (!port) port = 1234 ; sender = new UdpSender(uri.host.c_str(), port) ; @@ -92,8 +101,70 @@ video_outbuf_size = 256*1024 ; // FIXME ? video_outbuf = new uint8_t [video_outbuf_size] ; -@@ -346,7 +342,7 @@ namespace nucleo { - pkt.size = out_size ; + + switch (img->getEncoding()) { + case Image::ARGB: +- // PIX_FMT_RGBA32 is endian-sensitive... +- // srcEncoding = ByteOrder::isLittleEndian() ? PIX_FMT_RGB24 : PIX_FMT_RGBA32 ; +- srcEncoding = PIX_FMT_RGB24 ; ++ // AV_PIX_FMT_RGBA32 is endian-sensitive... ++ // srcEncoding = ByteOrder::isLittleEndian() ? AV_PIX_FMT_RGB24 : AV_PIX_FMT_RGBA32 ; ++ srcEncoding = AV_PIX_FMT_RGB24 ; + break ; +- case Image::L: srcEncoding = PIX_FMT_GRAY8 ; break ; +- case Image::YpCbCr420: srcEncoding = PIX_FMT_YUV420P ; break ; +- default: srcEncoding = PIX_FMT_RGB24 ; break ; ++ case Image::L: srcEncoding = AV_PIX_FMT_GRAY8 ; break ; ++ case Image::YpCbCr420: srcEncoding = AV_PIX_FMT_YUV420P ; break ; ++ default: srcEncoding = AV_PIX_FMT_RGB24 ; break ; + } + +- avcodec_get_frame_defaults(&srcPic) ; ++ av_frame_unref(&srcPic) ; + if (codec_context->pix_fmt==srcEncoding) + picture = &srcPic ; + else { +- avcodec_get_frame_defaults(&convPic) ; ++ av_frame_unref(&convPic) ; + int size = avpicture_get_size(codec_context->pix_fmt, codec_context->width, codec_context->height) ; + avpicture_fill((AVPicture *)&convPic, + new uint8_t [size], +@@ -304,7 +300,7 @@ namespace nucleo { + // std::cerr << "base: " << vstream->time_base.num << " / " << vstream->time_base.den << std::endl ; + + AVCodecContext *cctx = vstream->codec ; +- if (srcEncoding==PIX_FMT_RGB24) convertImage(img, Image::RGB) ; ++ if (srcEncoding==AV_PIX_FMT_RGB24) convertImage(img, Image::RGB) ; + resizeImage(img, cctx->width, cctx->height) ; + avpicture_fill((AVPicture *)&srcPic, img->getData(), srcEncoding, + cctx->width, cctx->height) ; +@@ -330,23 +326,23 @@ namespace nucleo { + picture->pts = pts ; + // std::cerr << "pts: " << pts << std::endl ; + +- int out_size = avcodec_encode_video(cctx, video_outbuf, video_outbuf_size, picture) ; +- if (!out_size) { +- std::cerr << "ffmpegImageSink: avcodec_encode_video returned 0" << std::endl ; ++ AVPacket pkt ; ++ av_init_packet(&pkt) ; ++ pkt.data = video_outbuf ; ++ pkt.size = video_outbuf_size ; ++ ++ int got_packet = 0 ; ++ int ret = avcodec_encode_video2(cctx, &pkt, picture, &got_packet) ; ++ if (ret) { ++ std::cerr << "ffmpegImageSink: avcodec_encode_video2 failed" << std::endl ; + stop() ; + return false ; + } + +- // std::cerr << "out_size = " << out_size << std::endl ; +- +- AVPacket pkt ; +- av_init_packet(&pkt) ; + pkt.stream_index = vstream->index ; +- pkt.data = video_outbuf ; +- pkt.size = out_size ; if (cctx->coded_frame) { pkt.pts = pkt.dts = pts ; - if (cctx->coded_frame->key_frame) pkt.flags |= PKT_FLAG_KEY ; Modified: branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSource.cxx ============================================================================== --- branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSource.cxx Fri Nov 4 08:48:49 2016 (r425305) +++ branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSource.cxx Fri Nov 4 08:52:19 2016 (r425306) @@ -1,6 +1,6 @@ ---- nucleo/plugins/ffmpeg/ffmpegImageSource.cxx.orig +--- nucleo/plugins/ffmpeg/ffmpegImageSource.cxx.orig 2009-05-25 12:53:15 UTC +++ nucleo/plugins/ffmpeg/ffmpegImageSource.cxx -@@ -47,23 +47,23 @@ +@@ -47,23 +47,23 @@ namespace nucleo { bool ffmpegImageSource::start(void) { @@ -28,7 +28,7 @@ video_stream = i ; found_video_stream = true ; } else -@@ -86,7 +86,7 @@ +@@ -86,7 +86,7 @@ namespace nucleo { return false ; } @@ -37,7 +37,7 @@ if (ret<0) { std::cerr << "ffmpegImageSource: unable to open codec" << std::endl ; return false ; -@@ -123,7 +123,7 @@ +@@ -123,39 +123,39 @@ namespace nucleo { #endif int got_picture = 0 ; @@ -46,3 +46,42 @@ av_free_packet(&packet) ; if (!got_picture) continue ; + lastImage.setTimeStamp() ; + switch (cctx->pix_fmt) { +- case PIX_FMT_GRAY8: ++ case AV_PIX_FMT_GRAY8: + lastImage.setDims(cctx->width, cctx->height) ; + lastImage.setEncoding(Image::L) ; + lastImage.setData(frame.data[0], cctx->width*cctx->height, Image::NONE) ; + break ; +- case PIX_FMT_RGB24: ++ case AV_PIX_FMT_RGB24: + lastImage.setDims(cctx->width, cctx->height) ; + lastImage.setEncoding(Image::RGB) ; + lastImage.setData(frame.data[0], (cctx->width*cctx->height)*3, Image::NONE) ; + break ; + default: // Convert everything else to RGB24 +- // PIX_FMT_YUV420P has three separate plans and ffmpeg converts ++ // AV_PIX_FMT_YUV420P has three separate plans and ffmpeg converts + // them to RGB faster than nucleo does... +- // PIX_FMT_RGBA32 and PIX_FMT_RGB565 are stored in cpu endianness ++ // AV_PIX_FMT_RGBA32 and AV_PIX_FMT_RGB565 are stored in cpu endianness + // On OS X (powerpc), they correspond to Image::ARGB and Image::RGB565 + lastImage.prepareFor(cctx->width, cctx->height, Image::RGB) ; + AVFrame tmpframe ; +- avpicture_fill((AVPicture*)&tmpframe, lastImage.getData(), PIX_FMT_RGB24, ++ avpicture_fill((AVPicture*)&tmpframe, lastImage.getData(), AV_PIX_FMT_RGB24, + cctx->width, cctx->height) ; + #if NO_SOFTWARE_SCALER +- img_convert((AVPicture*)&tmpframe, PIX_FMT_RGB24, ++ img_convert((AVPicture*)&tmpframe, AV_PIX_FMT_RGB24, + (AVPicture*)&frame, cctx->pix_fmt, cctx->width, cctx->height) ; + #else + SwsContext *swsc = 0 ; + swsc = sws_getCachedContext(swsc, + cctx->width, cctx->height, cctx->pix_fmt, +- cctx->width, cctx->height, PIX_FMT_RGB24, ++ cctx->width, cctx->height, AV_PIX_FMT_RGB24, + SWS_BICUBIC, NULL, NULL, NULL) ; + if (!swsc) { + std::cerr << "ffmpegImageSource: sws_getCachedContext failed" << std::endl ; Copied: branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo_plugins_ffmpeg_ffmpegImageSink.H (from r425305, head/x11-toolkits/nucleo/files/patch-nucleo_plugins_ffmpeg_ffmpegImageSink.H) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo_plugins_ffmpeg_ffmpegImageSink.H Fri Nov 4 08:52:19 2016 (r425306, copy of r425305, head/x11-toolkits/nucleo/files/patch-nucleo_plugins_ffmpeg_ffmpegImageSink.H) @@ -0,0 +1,11 @@ +--- nucleo/plugins/ffmpeg/ffmpegImageSink.H.orig 2009-05-25 12:53:15 UTC ++++ nucleo/plugins/ffmpeg/ffmpegImageSink.H +@@ -36,7 +36,7 @@ namespace nucleo { + AVFrame srcPic, convPic, *picture ; + int video_outbuf_size ; + uint8_t *video_outbuf ; +- enum PixelFormat srcEncoding ; ++ enum AVPixelFormat srcEncoding ; + + std::string filename ; // if used as a file sink + From owner-svn-ports-branches@freebsd.org Fri Nov 4 10:40:58 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 022C3C26FCF; Fri, 4 Nov 2016 10:40:58 +0000 (UTC) (envelope-from antoine@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 mx1.freebsd.org (Postfix) with ESMTPS id BA7D2FF2; Fri, 4 Nov 2016 10:40:57 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA4Aeuc2081409; Fri, 4 Nov 2016 10:40:56 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA4Aeu6e081401; Fri, 4 Nov 2016 10:40:56 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201611041040.uA4Aeu6e081401@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Fri, 4 Nov 2016 10:40:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425310 - in branches/2016Q4/emulators: linux_base-c6 linux_base-c7 linux_base-f10 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Nov 2016 10:40:58 -0000 Author: antoine Date: Fri Nov 4 10:40:56 2016 New Revision: 425310 URL: https://svnweb.freebsd.org/changeset/ports/425310 Log: MFH: r425303 r425309 Fix modes for /compat/linux/proc When linprocfs is mounted the mode set to /compat/linux/proc is set to 555 while the package said 755 meaning pkg will try to change it 755 and fail preventing upgrade or installation of the package because linprocfs does not support changing attributes. Enforce it to 555 to prevent that situation Apply r425303 to linux_base-f10: Fix modes for /compat/linux/proc Modified: branches/2016Q4/emulators/linux_base-c6/Makefile branches/2016Q4/emulators/linux_base-c6/pkg-plist.i386 branches/2016Q4/emulators/linux_base-c6/pkg-plist.x86_64 branches/2016Q4/emulators/linux_base-c7/Makefile branches/2016Q4/emulators/linux_base-c7/pkg-plist.i386 branches/2016Q4/emulators/linux_base-c7/pkg-plist.x86_64 branches/2016Q4/emulators/linux_base-f10/Makefile branches/2016Q4/emulators/linux_base-f10/pkg-plist Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/emulators/linux_base-c6/Makefile ============================================================================== --- branches/2016Q4/emulators/linux_base-c6/Makefile Fri Nov 4 10:37:26 2016 (r425309) +++ branches/2016Q4/emulators/linux_base-c6/Makefile Fri Nov 4 10:40:56 2016 (r425310) @@ -3,7 +3,7 @@ PORTNAME= c6 PORTVERSION= ${LINUX_DIST_VER} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators linux PKGNAMEPREFIX= linux_base- Modified: branches/2016Q4/emulators/linux_base-c6/pkg-plist.i386 ============================================================================== --- branches/2016Q4/emulators/linux_base-c6/pkg-plist.i386 Fri Nov 4 10:37:26 2016 (r425309) +++ branches/2016Q4/emulators/linux_base-c6/pkg-plist.i386 Fri Nov 4 10:40:56 2016 (r425310) @@ -2363,7 +2363,7 @@ var/mail @dir lib/tls @dir mnt @dir opt -@dir proc +@dir(,,555) proc @dir selinux @dir srv @dir sys Modified: branches/2016Q4/emulators/linux_base-c6/pkg-plist.x86_64 ============================================================================== --- branches/2016Q4/emulators/linux_base-c6/pkg-plist.x86_64 Fri Nov 4 10:37:26 2016 (r425309) +++ branches/2016Q4/emulators/linux_base-c6/pkg-plist.x86_64 Fri Nov 4 10:40:56 2016 (r425310) @@ -2792,7 +2792,7 @@ var/mail @dir lib64/tls @dir mnt @dir opt -@dir proc +@dir(,,555) proc @dir selinux @dir srv @dir sys Modified: branches/2016Q4/emulators/linux_base-c7/Makefile ============================================================================== --- branches/2016Q4/emulators/linux_base-c7/Makefile Fri Nov 4 10:37:26 2016 (r425309) +++ branches/2016Q4/emulators/linux_base-c7/Makefile Fri Nov 4 10:40:56 2016 (r425310) @@ -2,6 +2,7 @@ PORTNAME= c7 PORTVERSION= ${LINUX_DIST_VER} +PORTREVISION= 1 CATEGORIES= emulators linux PKGNAMEPREFIX= linux_base- EXTRACT_ONLY= ${DISTFILES:N*.src.rpm*:Nfilesystem-*} Modified: branches/2016Q4/emulators/linux_base-c7/pkg-plist.i386 ============================================================================== --- branches/2016Q4/emulators/linux_base-c7/pkg-plist.i386 Fri Nov 4 10:37:26 2016 (r425309) +++ branches/2016Q4/emulators/linux_base-c7/pkg-plist.i386 Fri Nov 4 10:40:56 2016 (r425310) @@ -2585,7 +2585,7 @@ var/mail @dir etc/xinetd.d @dir mnt @dir opt -@dir proc +@dir(,,555) proc @dir srv @dir sys @dir usr/etc Modified: branches/2016Q4/emulators/linux_base-c7/pkg-plist.x86_64 ============================================================================== --- branches/2016Q4/emulators/linux_base-c7/pkg-plist.x86_64 Fri Nov 4 10:37:26 2016 (r425309) +++ branches/2016Q4/emulators/linux_base-c7/pkg-plist.x86_64 Fri Nov 4 10:40:56 2016 (r425310) @@ -3033,7 +3033,7 @@ var/mail @dir etc/xinetd.d @dir mnt @dir opt -@dir proc +@dir(,,555) proc @dir srv @dir sys @dir usr/etc Modified: branches/2016Q4/emulators/linux_base-f10/Makefile ============================================================================== --- branches/2016Q4/emulators/linux_base-f10/Makefile Fri Nov 4 10:37:26 2016 (r425309) +++ branches/2016Q4/emulators/linux_base-f10/Makefile Fri Nov 4 10:40:56 2016 (r425310) @@ -3,7 +3,7 @@ PORTNAME= f10 PORTVERSION= ${LINUX_DIST_VER} -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= emulators linux PKGNAMEPREFIX= linux_base- Modified: branches/2016Q4/emulators/linux_base-f10/pkg-plist ============================================================================== --- branches/2016Q4/emulators/linux_base-f10/pkg-plist Fri Nov 4 10:37:26 2016 (r425309) +++ branches/2016Q4/emulators/linux_base-f10/pkg-plist Fri Nov 4 10:40:56 2016 (r425310) @@ -2531,7 +2531,7 @@ var/mail @dir sys @dir srv @dir selinux -@dir proc +@dir(,,555) proc @dir opt @dir mnt @dir lib/tls From owner-svn-ports-branches@freebsd.org Fri Nov 4 10:47:59 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9FF43C2F1EF; Fri, 4 Nov 2016 10:47:59 +0000 (UTC) (envelope-from jbeich@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 mx1.freebsd.org (Postfix) with ESMTPS id 7A2A7790; Fri, 4 Nov 2016 10:47:59 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA4Alw66083249; Fri, 4 Nov 2016 10:47:58 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA4AlwvL083246; Fri, 4 Nov 2016 10:47:58 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201611041047.uA4AlwvL083246@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 4 Nov 2016 10:47:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425312 - in branches/2016Q4/multimedia/bombono: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Nov 2016 10:47:59 -0000 Author: jbeich Date: Fri Nov 4 10:47:58 2016 New Revision: 425312 URL: https://svnweb.freebsd.org/changeset/ports/425312 Log: MFH: r425311 multimedia/bombono: unbreak build with ffmpeg 3.x src/mgui/ffviewer.cpp:642:22: error: 'SWS_CPU_CAPS_MMX' was not declared in this scope sws_flags |= SWS_CPU_CAPS_MMX|SWS_CPU_CAPS_MMX2; ^ src/mgui/ffviewer.cpp:642:39: error: 'SWS_CPU_CAPS_MMX2' was not declared in this scope sws_flags |= SWS_CPU_CAPS_MMX|SWS_CPU_CAPS_MMX2; ^ src/mgui/ffviewer.cpp:650:9: error: 'PixelFormat' was not declared in this scope PixelFormat dst_pf = PIX_FMT_BGR24; // PIX_FMT_RGB24; ^ src/mgui/ffviewer.cpp:650:21: error: expected ';' before 'dst_pf' PixelFormat dst_pf = PIX_FMT_BGR24; // PIX_FMT_RGB24; ^ src/mgui/ffviewer.cpp:652:13: error: 'dst_pf' was not declared in this scope dst_pf, sws_flags, 0, 0, 0); ^ src/mgui/ffviewer.cpp:657:45: error: 'avcodec_get_frame_defaults' was not declared in this scope avcodec_get_frame_defaults(&rgbFrame); // не помешает ^ PR: 207547 Obtained from: upstream Approved by: ports-secteam blanket Modified: branches/2016Q4/multimedia/bombono/Makefile branches/2016Q4/multimedia/bombono/files/patch-src_mgui_ffviewer.cpp Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/multimedia/bombono/Makefile ============================================================================== --- branches/2016Q4/multimedia/bombono/Makefile Fri Nov 4 10:45:19 2016 (r425311) +++ branches/2016Q4/multimedia/bombono/Makefile Fri Nov 4 10:47:58 2016 (r425312) @@ -3,7 +3,7 @@ PORTNAME= bombono PORTVERSION= 1.2.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-dvd/${PORTVERSION:R} DISTNAME= ${PORTNAME}-dvd-${PORTVERSION} Modified: branches/2016Q4/multimedia/bombono/files/patch-src_mgui_ffviewer.cpp ============================================================================== --- branches/2016Q4/multimedia/bombono/files/patch-src_mgui_ffviewer.cpp Fri Nov 4 10:45:19 2016 (r425311) +++ branches/2016Q4/multimedia/bombono/files/patch-src_mgui_ffviewer.cpp Fri Nov 4 10:47:58 2016 (r425312) @@ -1,24 +1,134 @@ +https://github.com/muravjov/bombono-dvd/commit/282273b8a581 +https://github.com/muravjov/bombono-dvd/commit/2d72b907a81a +https://github.com/muravjov/bombono-dvd/commit/11f8b5a9cb2f + --- src/mgui/ffviewer.cpp.orig 2013-03-07 21:20:45 UTC +++ src/mgui/ffviewer.cpp -@@ -406,7 +406,7 @@ static std::string CodecID2Str(CodecID c +@@ -48,6 +48,18 @@ C_LINKAGE_BEGIN + C_LINKAGE_END + #endif + ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57,05,00) ++C_LINKAGE_BEGIN ++#include ++C_LINKAGE_END ++static int bmd_avpicture_get_size(enum AVPixelFormat pix_fmt, int width, int height) ++{ ++ return av_image_get_buffer_size(pix_fmt, width, height, 1); ++} ++#else ++#define bmd_avpicture_get_size avpicture_get_size ++#endif ++ + // Прямой доступ к ff_codec_bmp_tags, в частности, закрыл, некий + // Anton Khirnov, см. libavformat/libavformat.v (из него генерится скрипт + // для опции --version-script= линковщика ld) +@@ -406,7 +418,11 @@ static std::string CodecID2Str(CodecID codec_id) #else // CALC_FF_TAG -static std::string CodecID2Str(CodecID codec_id) ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,00,00) ++//#define CodecID AVCodecID ++#endif ++ +static std::string CodecID2Str(AVCodecID codec_id) { return Int2Str(codec_id); } -@@ -1119,8 +1119,10 @@ static bool SeekSetTime(FFViewer& ffv, d +@@ -617,6 +633,17 @@ FFInfo::~FFInfo() + CloseInfo(*this); + } + ++static int bmd_avpicture_fill(AVFrame *picture, const uint8_t *ptr, ++ AVPixelFormat pix_fmt, int width, int height) ++{ ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57,5,00) ++ return av_image_fill_arrays(picture->data, picture->linesize, ++ ptr, pix_fmt, width, height, 1); ++#else ++ return avpicture_fill((AVPicture*)picture, ptr, pix_fmt, width, height); ++#endif ++} ++ + bool FFViewer::Open(const char* fname, std::string& err_str) + { + // * закрываем открытое ранее +@@ -635,11 +662,14 @@ bool FFViewer::Open(const char* fname, std::string& err_str) + // opt_default(); // обновление sws_opts по -sws_flags + // sws_flags = av_get_int(sws_opts, "sws_flags", NULL); // = sws_opts.flags + int sws_flags = SWS_BICUBIC; ++ ++#if !(LIBSWSCALE_VERSION_INT >= AV_VERSION_INT(3,0,0)) + // при сборке с --enable-runtime-cpudetect (появилось после 0.5), который полюбили пакетировщики, + // лучшая оптимизация выбирается на этапе выполнения, а не сборке; однако для 0.6 времени + // maverick оно еще не доделано, см. http://ffmpeg.arrozcru.org/forum/viewtopic.php?f=1&t=1185 + // :KLUDGE: потому добавляем явно + sws_flags |= SWS_CPU_CAPS_MMX|SWS_CPU_CAPS_MMX2; ++#endif + + // :TRICKY: почему-то ffmpeg'у "нравится" BGR24 и не нравиться RGB24 в плане использования + // MMX (ускорения); цена по времени неизвестна,- используем только ради того, чтобы не было +@@ -647,15 +677,27 @@ bool FFViewer::Open(const char* fname, std::string& err_str) + // Другой вариант - PIX_FMT_RGB32, но там зависимый порядок байтов (в GdkPixbuf - нет) и + // мы нацелены на RGB24 + // :TODO: с версии LIBSWSCALE_VERSION_INT >= 0.8.11 появился прямой yuv -> rgb24, поправить ++#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(54,17,00) ++ AVPixelFormat dst_pf = AV_PIX_FMT_BGR24; // AV_PIX_FMT_RGB24; ++#else + PixelFormat dst_pf = PIX_FMT_BGR24; // PIX_FMT_RGB24; ++#endif ++ + rgbCnvCtx = sws_getContext(sz.x, sz.y, GetVideoCtx(*this)->pix_fmt, sz.x, sz.y, + dst_pf, sws_flags, 0, 0, 0); + ASSERT( rgbCnvCtx ); + + Point dst_sz(sz); +- rgbBuf = (uint8_t*)av_malloc(avpicture_get_size(dst_pf, dst_sz.x, dst_sz.y) * sizeof(uint8_t)); +- avcodec_get_frame_defaults(&rgbFrame); // не помешает +- avpicture_fill((AVPicture*)&rgbFrame, rgbBuf, dst_pf, dst_sz.x, dst_sz.y); ++ rgbBuf = (uint8_t*)av_malloc(bmd_avpicture_get_size(dst_pf, dst_sz.x, dst_sz.y) * sizeof(uint8_t)); ++ ++ // не помешает ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(56,35,01) ++ av_frame_unref(&rgbFrame); ++#else ++ avcodec_get_frame_defaults(&rgbFrame); ++#endif ++ ++ bmd_avpicture_fill(&rgbFrame, rgbBuf, dst_pf, dst_sz.x, dst_sz.y); + } + else + // защита от неполных открытий +@@ -841,7 +883,11 @@ static bool DoDecode(FFViewer& ffv) + + DoVideoDecode(ffv, got_picture, &pkt); + } ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57,8,00) ++ av_packet_unref(&pkt); ++#else + av_free_packet(&pkt); ++#endif + } + else if( av_res == (int)AVERROR_EOF ) // для mpegts также -EIO приходит + { +@@ -1119,8 +1165,18 @@ static bool SeekSetTime(FFViewer& ffv, double time) { bool seek_ok = TimeSeek(ffv, start_time, time); if( !seek_ok && CanByteSeek(ffv.iCtx) ) -- // тогда переходим в начало файла ++ { + // тогда переходим в начало файла - seek_ok = DoSeek(ffv, ffv.iCtx->data_offset, true); -+ // then seek to the file's start; since data_offset is private -+ // now, if we seek to 0 and there is a data_offset our seek will -+ // be rounded to the minimum possible, i.e. data_offset. -+ seek_ok = DoSeek(ffv, /* ffv.iCtx->data_offset */ 0, true); ++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(56,11,00) ++ // автор 9deaec782810d098bca11c9332fab2d2f4c5fb78 уверяет, что ++ // сокрытие AVFormatContext.internal в internal.h - это нормально ++ //int64_t data_offset = ffv.iCtx->internal->data_offset; ++ int64_t data_offset = 0; ++#else ++ int64_t data_offset = ffv.iCtx->data_offset; ++#endif ++ seek_ok = DoSeek(ffv, data_offset, true); ++ } // некоторое видео глючит в начале (Hellboy), из-за чего // последовательный доступ выполняется с перескоками - From owner-svn-ports-branches@freebsd.org Fri Nov 4 12:06:16 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CC916C2E767; Fri, 4 Nov 2016 12:06:16 +0000 (UTC) (envelope-from jbeich@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 mx1.freebsd.org (Postfix) with ESMTPS id A991F9F7; Fri, 4 Nov 2016 12:06:16 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA4C6FSj014318; Fri, 4 Nov 2016 12:06:15 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA4C6Fvo014315; Fri, 4 Nov 2016 12:06:15 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201611041206.uA4C6Fvo014315@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 4 Nov 2016 12:06:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425316 - in branches/2016Q4/multimedia/nordlicht: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Nov 2016 12:06:16 -0000 Author: jbeich Date: Fri Nov 4 12:06:15 2016 New Revision: 425316 URL: https://svnweb.freebsd.org/changeset/ports/425316 Log: MFH: r425315 multimedia/nordlicht: unbreak build with ffmpeg 3.x image.c:28:24: error: use of undeclared identifier 'PIX_FMT_RGB24'; did you mean 'AV_PIX_FMT_RGB24'? i->frame->format = PIX_FMT_RGB24; // best choice? ^~~~~~~~~~~~~ AV_PIX_FMT_RGB24 /usr/local/include/libavutil/pixfmt.h:64:5: note: 'AV_PIX_FMT_RGB24' declared here AV_PIX_FMT_RGB24, ///< packed RGB 8:8:8, 24bpp, RGBRGB... ^ image.c:243:32: error: use of undeclared identifier 'PIX_FMT_RGB24'; did you mean 'AV_PIX_FMT_RGB24'? encoder_context->pix_fmt = PIX_FMT_RGB24; ^~~~~~~~~~~~~ AV_PIX_FMT_RGB24 /usr/local/include/libavutil/pixfmt.h:64:5: note: 'AV_PIX_FMT_RGB24' declared here AV_PIX_FMT_RGB24, ///< packed RGB 8:8:8, 24bpp, RGBRGB... ^ PR: 214196 Submitted by: Tobias Kortkamp (maintainer) Obtained from: upstream Approved by: ports-secteam blanket Added: branches/2016Q4/multimedia/nordlicht/files/patch-image.c - copied unchanged from r425315, head/multimedia/nordlicht/files/patch-image.c branches/2016Q4/multimedia/nordlicht/files/patch-source.c - copied unchanged from r425315, head/multimedia/nordlicht/files/patch-source.c Modified: branches/2016Q4/multimedia/nordlicht/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/multimedia/nordlicht/Makefile ============================================================================== --- branches/2016Q4/multimedia/nordlicht/Makefile Fri Nov 4 12:03:32 2016 (r425315) +++ branches/2016Q4/multimedia/nordlicht/Makefile Fri Nov 4 12:06:15 2016 (r425316) @@ -4,6 +4,7 @@ PORTNAME= nordlicht PORTVERSION= 0.4.4 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= t@tobik.me Copied: branches/2016Q4/multimedia/nordlicht/files/patch-image.c (from r425315, head/multimedia/nordlicht/files/patch-image.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/multimedia/nordlicht/files/patch-image.c Fri Nov 4 12:06:15 2016 (r425316, copy of r425315, head/multimedia/nordlicht/files/patch-image.c) @@ -0,0 +1,68 @@ +For ffmpeg 3.x compatibility + +https://github.com/nordlicht/nordlicht/commit/5505a1898ab997a23b75553794eff6609447c43b.patch +https://github.com/nordlicht/nordlicht/commit/6e534a0c273756b88eecea7f510b6aa8a62dd789.patch +and https://github.com/nordlicht/nordlicht/pull/63/commits/b8f439c2796d6b1de73511c0610aecb31c942790 + +--- image.c.orig 2016-01-24 19:35:50 UTC ++++ image.c +@@ -5,11 +5,36 @@ + #include + #include + ++// Changes for ffmpeg 3.0 ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57,24,0) ++# include ++# define av_free_packet av_packet_unref ++# define avpicture_get_size(fmt,w,h) av_image_get_buffer_size(fmt,w,h,1) ++#endif ++ ++// PIX_FMT was renamed to AV_PIX_FMT on this version ++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51,74,100) ++# define AVPixelFormat PixelFormat ++# define AV_PIX_FMT_RGB24 PIX_FMT_RGB24 ++# define AV_PIX_FMT_YUVJ420P PIX_FMT_YUVJ420P ++# define AV_PIX_FMT_YUVJ422P PIX_FMT_YUVJ422P ++# define AV_PIX_FMT_YUVJ440P PIX_FMT_YUVJ440P ++# define AV_PIX_FMT_YUVJ444P PIX_FMT_YUVJ444P ++# define AV_PIX_FMT_YUV420P PIX_FMT_YUV420P ++# define AV_PIX_FMT_YUV422P PIX_FMT_YUV422P ++# define AV_PIX_FMT_YUV440P PIX_FMT_YUV440P ++# define AV_PIX_FMT_YUV444P PIX_FMT_YUV444P ++#endif ++ + #if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(52, 8, 0) +-#define av_frame_alloc avcodec_alloc_frame +-#define av_frame_free av_freep ++# define av_frame_alloc avcodec_alloc_frame ++# if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,59,100) ++# define av_frame_free av_freep ++# else ++# define av_frame_free avcodec_free_frame ++# endif + void av_frame_get_buffer(AVFrame *frame, int magic) { avpicture_alloc((AVPicture *)frame, frame->format, frame->width, frame->height); } +-void av_frame_copy(AVFrame *dst, AVFrame *src) { memcpy(dst->data[0], src->data[0], sizeof(uint8_t)*avpicture_get_size(PIX_FMT_RGB24, dst->width, dst->height)); } ++void av_frame_copy(AVFrame *dst, AVFrame *src) { memcpy(dst->data[0], src->data[0], sizeof(uint8_t)*avpicture_get_size(AV_PIX_FMT_RGB24, dst->width, dst->height)); } + #endif + + #define MAX_FILTER_SIZE 256 +@@ -25,7 +50,7 @@ image *image_init(const int width, const + i->frame = (AVFrame *) av_frame_alloc(); + i->frame->width = width; + i->frame->height = height; +- i->frame->format = PIX_FMT_RGB24; // best choice? ++ i->frame->format = AV_PIX_FMT_RGB24; // best choice? + av_frame_get_buffer(i->frame, 16); // magic number? + return i; + } +@@ -240,7 +265,9 @@ int image_write_png(const image *i, cons + encoder_context = avcodec_alloc_context3(encoder); + encoder_context->width = i->frame->width; + encoder_context->height = i->frame->height; +- encoder_context->pix_fmt = PIX_FMT_RGB24; ++ encoder_context->pix_fmt = AV_PIX_FMT_RGB24; ++ encoder_context->time_base.num = 1; ++ encoder_context->time_base.den = 1; + if (avcodec_open2(encoder_context, encoder, NULL) < 0) { + error("Could not open output codec."); + return -1; Copied: branches/2016Q4/multimedia/nordlicht/files/patch-source.c (from r425315, head/multimedia/nordlicht/files/patch-source.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/multimedia/nordlicht/files/patch-source.c Fri Nov 4 12:06:15 2016 (r425316, copy of r425315, head/multimedia/nordlicht/files/patch-source.c) @@ -0,0 +1,66 @@ +For ffmpeg 3.x compatibility + +https://github.com/nordlicht/nordlicht/commit/5505a1898ab997a23b75553794eff6609447c43b.patch +https://github.com/nordlicht/nordlicht/commit/6e534a0c273756b88eecea7f510b6aa8a62dd789.patch + +--- source.c.orig 2016-01-24 19:35:50 UTC ++++ source.c +@@ -6,9 +6,34 @@ + #include + #include + ++// Changes for ffmpeg 3.0 ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57,24,0) ++# include ++# define av_free_packet av_packet_unref ++# define avpicture_get_size(fmt,w,h) av_image_get_buffer_size(fmt,w,h,1) ++#endif ++ ++// PIX_FMT was renamed to AV_PIX_FMT on this version ++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51,74,100) ++# define AVPixelFormat PixelFormat ++# define AV_PIX_FMT_RGB24 PIX_FMT_RGB24 ++# define AV_PIX_FMT_YUVJ420P PIX_FMT_YUVJ420P ++# define AV_PIX_FMT_YUVJ422P PIX_FMT_YUVJ422P ++# define AV_PIX_FMT_YUVJ440P PIX_FMT_YUVJ440P ++# define AV_PIX_FMT_YUVJ444P PIX_FMT_YUVJ444P ++# define AV_PIX_FMT_YUV420P PIX_FMT_YUV420P ++# define AV_PIX_FMT_YUV422P PIX_FMT_YUV422P ++# define AV_PIX_FMT_YUV440P PIX_FMT_YUV440P ++# define AV_PIX_FMT_YUV444P PIX_FMT_YUV444P ++#endif ++ + #if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(52, 8, 0) +-#define av_frame_alloc avcodec_alloc_frame +-#define av_frame_free av_freep ++# define av_frame_alloc avcodec_alloc_frame ++# if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,59,100) ++# define av_frame_free av_freep ++# else ++# define av_frame_free avcodec_free_frame ++# endif + #endif + + #define HEURISTIC_NUMBER_OF_FRAMES 1800 // how many frames will the heuristic look at? +@@ -244,13 +269,17 @@ source* source_init(const char *filename + s->scaleframe = av_frame_alloc(); + s->scaleframe->width = s->video->frame->width; + s->scaleframe->height = s->video->frame->height; +- s->scaleframe->format = PIX_FMT_RGB24; ++ s->scaleframe->format = AV_PIX_FMT_RGB24; + +- s->buffer = (uint8_t *)av_malloc(sizeof(uint8_t)*avpicture_get_size(PIX_FMT_RGB24, s->scaleframe->width, s->scaleframe->height)); +- avpicture_fill((AVPicture *)s->scaleframe, s->buffer, PIX_FMT_RGB24, s->video->frame->width, s->video->frame->height); ++ s->buffer = (uint8_t *)av_malloc(sizeof(uint8_t)*avpicture_get_size(s->scaleframe->format, s->scaleframe->width, s->scaleframe->height)); ++ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57,24,0) ++ av_image_fill_arrays(s->scaleframe->data, s->scaleframe->linesize, s->buffer, s->scaleframe->format, s->video->frame->width, s->video->frame->height, 1); ++ #else ++ avpicture_fill((AVPicture *)s->scaleframe, s->buffer, s->scaleframe->format, s->video->frame->width, s->video->frame->height); ++ #endif + + s->sws_context = sws_getCachedContext(NULL, s->video->frame->width, s->video->frame->height, s->video->frame->format, +- s->scaleframe->width, s->scaleframe->height, PIX_FMT_RGB24, SWS_AREA, NULL, NULL, NULL); ++ s->scaleframe->width, s->scaleframe->height, s->scaleframe->format, SWS_AREA, NULL, NULL, NULL); + } + + s->keyframes = NULL; From owner-svn-ports-branches@freebsd.org Fri Nov 4 14:29:15 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A17F4C2F3CE; Fri, 4 Nov 2016 14:29:15 +0000 (UTC) (envelope-from jbeich@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 mx1.freebsd.org (Postfix) with ESMTPS id 7AA0DCB3; Fri, 4 Nov 2016 14:29:15 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA4ETEWV069209; Fri, 4 Nov 2016 14:29:14 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA4ETEgg069206; Fri, 4 Nov 2016 14:29:14 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201611041429.uA4ETEgg069206@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 4 Nov 2016 14:29:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425325 - in branches/2016Q4/x11-toolkits/nucleo: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Nov 2016 14:29:15 -0000 Author: jbeich Date: Fri Nov 4 14:29:14 2016 New Revision: 425325 URL: https://svnweb.freebsd.org/changeset/ports/425325 Log: x11-toolkits/nucleo: back out r425306 avcodec_encode_video -> avcodec_encode_video2 is a bit risky. And my conversion had a bug (see r425324). Let it bake on /head like usual. PR: 207547 Pointyhat to: jbeich Approved by: ports-secteam blanket Deleted: branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo_plugins_ffmpeg_ffmpegImageSink.H Modified: branches/2016Q4/x11-toolkits/nucleo/Makefile branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSink.cxx branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSource.cxx Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/x11-toolkits/nucleo/Makefile ============================================================================== --- branches/2016Q4/x11-toolkits/nucleo/Makefile Fri Nov 4 14:24:06 2016 (r425324) +++ branches/2016Q4/x11-toolkits/nucleo/Makefile Fri Nov 4 14:29:14 2016 (r425325) @@ -3,7 +3,7 @@ PORTNAME= nucleo PORTVERSION= 0.7.6 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= x11-toolkits MASTER_SITES= http://insitu.lri.fr/metisse/download/nucleo/ Modified: branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSink.cxx ============================================================================== --- branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSink.cxx Fri Nov 4 14:24:06 2016 (r425324) +++ branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSink.cxx Fri Nov 4 14:29:14 2016 (r425325) @@ -1,6 +1,6 @@ ---- nucleo/plugins/ffmpeg/ffmpegImageSink.cxx.orig 2009-05-25 12:53:15 UTC -+++ nucleo/plugins/ffmpeg/ffmpegImageSink.cxx -@@ -118,17 +118,17 @@ namespace nucleo { +--- nucleo/plugins/ffmpeg/ffmpegImageSink.cxx.orig 2009-05-25 14:53:15.000000000 +0200 ++++ nucleo/plugins/ffmpeg/ffmpegImageSink.cxx 2015-07-03 23:24:23.255152399 +0200 +@@ -118,11 +118,11 @@ namespace nucleo { output_format = 0 ; if (uri.scheme=="mpegts-udp") { @@ -15,13 +15,6 @@ } std::string message ; - if (!output_format) - message = "Unable to find the requested format" ; -- else if (output_format->video_codec == CODEC_ID_NONE) { -+ else if (output_format->video_codec == AV_CODEC_ID_NONE) { - output_format = 0 ; - message = "Not a video format" ; - } else if (output_format->flags & AVFMT_NOFILE) { @@ -156,12 +156,13 @@ namespace nucleo { snprintf(format_context->filename, sizeof(format_context->filename), "%s", filename.c_str()) ; @@ -37,17 +30,15 @@ // ---------------- -@@ -190,8 +191,8 @@ namespace nucleo { +@@ -190,7 +191,7 @@ namespace nucleo { AVCodecContext *codec_context = vstream->codec ; codec_context->codec_id = output_format->video_codec ; - codec_context->codec_type = CODEC_TYPE_VIDEO ; -- codec_context->pix_fmt = PIX_FMT_YUV420P ; + codec_context->codec_type = AVMEDIA_TYPE_VIDEO ; -+ codec_context->pix_fmt = AV_PIX_FMT_YUV420P ; + codec_context->pix_fmt = PIX_FMT_YUV420P ; codec_context->width = img->getWidth() ; // must be a multiple of two codec_context->height = img->getHeight() ; // must be a multiple of two - codec_context->me_method = ME_EPZS ; // ME_ZERO @@ -210,12 +211,7 @@ namespace nucleo { || !strcmp(format_context->oformat->name, "3gp")) codec_context->flags |= CODEC_FLAG_GLOBAL_HEADER ; @@ -80,7 +71,7 @@ std::cerr << "ffmpegImageSink: could not open " << filename << std::endl ; return false ; } -@@ -245,37 +241,37 @@ namespace nucleo { +@@ -245,17 +241,17 @@ namespace nucleo { int port = uri.port ; if (!port) port = 1234 ; sender = new UdpSender(uri.host.c_str(), port) ; @@ -101,70 +92,8 @@ video_outbuf_size = 256*1024 ; // FIXME ? video_outbuf = new uint8_t [video_outbuf_size] ; - - switch (img->getEncoding()) { - case Image::ARGB: -- // PIX_FMT_RGBA32 is endian-sensitive... -- // srcEncoding = ByteOrder::isLittleEndian() ? PIX_FMT_RGB24 : PIX_FMT_RGBA32 ; -- srcEncoding = PIX_FMT_RGB24 ; -+ // AV_PIX_FMT_RGBA32 is endian-sensitive... -+ // srcEncoding = ByteOrder::isLittleEndian() ? AV_PIX_FMT_RGB24 : AV_PIX_FMT_RGBA32 ; -+ srcEncoding = AV_PIX_FMT_RGB24 ; - break ; -- case Image::L: srcEncoding = PIX_FMT_GRAY8 ; break ; -- case Image::YpCbCr420: srcEncoding = PIX_FMT_YUV420P ; break ; -- default: srcEncoding = PIX_FMT_RGB24 ; break ; -+ case Image::L: srcEncoding = AV_PIX_FMT_GRAY8 ; break ; -+ case Image::YpCbCr420: srcEncoding = AV_PIX_FMT_YUV420P ; break ; -+ default: srcEncoding = AV_PIX_FMT_RGB24 ; break ; - } - -- avcodec_get_frame_defaults(&srcPic) ; -+ av_frame_unref(&srcPic) ; - if (codec_context->pix_fmt==srcEncoding) - picture = &srcPic ; - else { -- avcodec_get_frame_defaults(&convPic) ; -+ av_frame_unref(&convPic) ; - int size = avpicture_get_size(codec_context->pix_fmt, codec_context->width, codec_context->height) ; - avpicture_fill((AVPicture *)&convPic, - new uint8_t [size], -@@ -304,7 +300,7 @@ namespace nucleo { - // std::cerr << "base: " << vstream->time_base.num << " / " << vstream->time_base.den << std::endl ; - - AVCodecContext *cctx = vstream->codec ; -- if (srcEncoding==PIX_FMT_RGB24) convertImage(img, Image::RGB) ; -+ if (srcEncoding==AV_PIX_FMT_RGB24) convertImage(img, Image::RGB) ; - resizeImage(img, cctx->width, cctx->height) ; - avpicture_fill((AVPicture *)&srcPic, img->getData(), srcEncoding, - cctx->width, cctx->height) ; -@@ -330,23 +326,23 @@ namespace nucleo { - picture->pts = pts ; - // std::cerr << "pts: " << pts << std::endl ; - -- int out_size = avcodec_encode_video(cctx, video_outbuf, video_outbuf_size, picture) ; -- if (!out_size) { -- std::cerr << "ffmpegImageSink: avcodec_encode_video returned 0" << std::endl ; -+ AVPacket pkt ; -+ av_init_packet(&pkt) ; -+ pkt.data = video_outbuf ; -+ pkt.size = video_outbuf_size ; -+ -+ int got_packet = 0 ; -+ int ret = avcodec_encode_video2(cctx, &pkt, picture, &got_packet) ; -+ if (ret) { -+ std::cerr << "ffmpegImageSink: avcodec_encode_video2 failed" << std::endl ; - stop() ; - return false ; - } - -- // std::cerr << "out_size = " << out_size << std::endl ; -- -- AVPacket pkt ; -- av_init_packet(&pkt) ; - pkt.stream_index = vstream->index ; -- pkt.data = video_outbuf ; -- pkt.size = out_size ; +@@ -346,7 +342,7 @@ namespace nucleo { + pkt.size = out_size ; if (cctx->coded_frame) { pkt.pts = pkt.dts = pts ; - if (cctx->coded_frame->key_frame) pkt.flags |= PKT_FLAG_KEY ; Modified: branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSource.cxx ============================================================================== --- branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSource.cxx Fri Nov 4 14:24:06 2016 (r425324) +++ branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSource.cxx Fri Nov 4 14:29:14 2016 (r425325) @@ -1,6 +1,6 @@ ---- nucleo/plugins/ffmpeg/ffmpegImageSource.cxx.orig 2009-05-25 12:53:15 UTC +--- nucleo/plugins/ffmpeg/ffmpegImageSource.cxx.orig +++ nucleo/plugins/ffmpeg/ffmpegImageSource.cxx -@@ -47,23 +47,23 @@ namespace nucleo { +@@ -47,23 +47,23 @@ bool ffmpegImageSource::start(void) { @@ -28,7 +28,7 @@ video_stream = i ; found_video_stream = true ; } else -@@ -86,7 +86,7 @@ namespace nucleo { +@@ -86,7 +86,7 @@ return false ; } @@ -37,7 +37,7 @@ if (ret<0) { std::cerr << "ffmpegImageSource: unable to open codec" << std::endl ; return false ; -@@ -123,39 +123,39 @@ namespace nucleo { +@@ -123,7 +123,7 @@ #endif int got_picture = 0 ; @@ -46,42 +46,3 @@ av_free_packet(&packet) ; if (!got_picture) continue ; - lastImage.setTimeStamp() ; - switch (cctx->pix_fmt) { -- case PIX_FMT_GRAY8: -+ case AV_PIX_FMT_GRAY8: - lastImage.setDims(cctx->width, cctx->height) ; - lastImage.setEncoding(Image::L) ; - lastImage.setData(frame.data[0], cctx->width*cctx->height, Image::NONE) ; - break ; -- case PIX_FMT_RGB24: -+ case AV_PIX_FMT_RGB24: - lastImage.setDims(cctx->width, cctx->height) ; - lastImage.setEncoding(Image::RGB) ; - lastImage.setData(frame.data[0], (cctx->width*cctx->height)*3, Image::NONE) ; - break ; - default: // Convert everything else to RGB24 -- // PIX_FMT_YUV420P has three separate plans and ffmpeg converts -+ // AV_PIX_FMT_YUV420P has three separate plans and ffmpeg converts - // them to RGB faster than nucleo does... -- // PIX_FMT_RGBA32 and PIX_FMT_RGB565 are stored in cpu endianness -+ // AV_PIX_FMT_RGBA32 and AV_PIX_FMT_RGB565 are stored in cpu endianness - // On OS X (powerpc), they correspond to Image::ARGB and Image::RGB565 - lastImage.prepareFor(cctx->width, cctx->height, Image::RGB) ; - AVFrame tmpframe ; -- avpicture_fill((AVPicture*)&tmpframe, lastImage.getData(), PIX_FMT_RGB24, -+ avpicture_fill((AVPicture*)&tmpframe, lastImage.getData(), AV_PIX_FMT_RGB24, - cctx->width, cctx->height) ; - #if NO_SOFTWARE_SCALER -- img_convert((AVPicture*)&tmpframe, PIX_FMT_RGB24, -+ img_convert((AVPicture*)&tmpframe, AV_PIX_FMT_RGB24, - (AVPicture*)&frame, cctx->pix_fmt, cctx->width, cctx->height) ; - #else - SwsContext *swsc = 0 ; - swsc = sws_getCachedContext(swsc, - cctx->width, cctx->height, cctx->pix_fmt, -- cctx->width, cctx->height, PIX_FMT_RGB24, -+ cctx->width, cctx->height, AV_PIX_FMT_RGB24, - SWS_BICUBIC, NULL, NULL, NULL) ; - if (!swsc) { - std::cerr << "ffmpegImageSource: sws_getCachedContext failed" << std::endl ; From owner-svn-ports-branches@freebsd.org Fri Nov 4 16:39:37 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4F265C30820; Fri, 4 Nov 2016 16:39:37 +0000 (UTC) (envelope-from jkim@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 mx1.freebsd.org (Postfix) with ESMTPS id 29A47102; Fri, 4 Nov 2016 16:39:37 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA4GdaLo020649; Fri, 4 Nov 2016 16:39:36 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA4GdZtV020640; Fri, 4 Nov 2016 16:39:35 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201611041639.uA4GdZtV020640@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Fri, 4 Nov 2016 16:39:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425340 - in branches/2016Q4/emulators: linux_base-c6 linux_base-c7 linux_base-f10 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Nov 2016 16:39:37 -0000 Author: jkim Date: Fri Nov 4 16:39:35 2016 New Revision: 425340 URL: https://svnweb.freebsd.org/changeset/ports/425340 Log: MFH: r425333 Fix modes for /compat/linux/sys. Approved by: ports-secteam (feld) Modified: branches/2016Q4/emulators/linux_base-c6/Makefile branches/2016Q4/emulators/linux_base-c6/pkg-plist.i386 branches/2016Q4/emulators/linux_base-c6/pkg-plist.x86_64 branches/2016Q4/emulators/linux_base-c7/Makefile branches/2016Q4/emulators/linux_base-c7/pkg-plist.i386 branches/2016Q4/emulators/linux_base-c7/pkg-plist.x86_64 branches/2016Q4/emulators/linux_base-f10/Makefile branches/2016Q4/emulators/linux_base-f10/pkg-plist Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/emulators/linux_base-c6/Makefile ============================================================================== --- branches/2016Q4/emulators/linux_base-c6/Makefile Fri Nov 4 16:31:24 2016 (r425339) +++ branches/2016Q4/emulators/linux_base-c6/Makefile Fri Nov 4 16:39:35 2016 (r425340) @@ -3,7 +3,7 @@ PORTNAME= c6 PORTVERSION= ${LINUX_DIST_VER} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators linux PKGNAMEPREFIX= linux_base- Modified: branches/2016Q4/emulators/linux_base-c6/pkg-plist.i386 ============================================================================== --- branches/2016Q4/emulators/linux_base-c6/pkg-plist.i386 Fri Nov 4 16:31:24 2016 (r425339) +++ branches/2016Q4/emulators/linux_base-c6/pkg-plist.i386 Fri Nov 4 16:39:35 2016 (r425340) @@ -2366,7 +2366,7 @@ var/mail @dir(,,555) proc @dir selinux @dir srv -@dir sys +@dir(,,555) sys @dir usr/etc @dir usr/games @dir usr/lib/X11 Modified: branches/2016Q4/emulators/linux_base-c6/pkg-plist.x86_64 ============================================================================== --- branches/2016Q4/emulators/linux_base-c6/pkg-plist.x86_64 Fri Nov 4 16:31:24 2016 (r425339) +++ branches/2016Q4/emulators/linux_base-c6/pkg-plist.x86_64 Fri Nov 4 16:39:35 2016 (r425340) @@ -2795,7 +2795,7 @@ var/mail @dir(,,555) proc @dir selinux @dir srv -@dir sys +@dir(,,555) sys @dir usr/etc @dir usr/games @dir usr/lib/games Modified: branches/2016Q4/emulators/linux_base-c7/Makefile ============================================================================== --- branches/2016Q4/emulators/linux_base-c7/Makefile Fri Nov 4 16:31:24 2016 (r425339) +++ branches/2016Q4/emulators/linux_base-c7/Makefile Fri Nov 4 16:39:35 2016 (r425340) @@ -2,7 +2,7 @@ PORTNAME= c7 PORTVERSION= ${LINUX_DIST_VER} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators linux PKGNAMEPREFIX= linux_base- EXTRACT_ONLY= ${DISTFILES:N*.src.rpm*:Nfilesystem-*} Modified: branches/2016Q4/emulators/linux_base-c7/pkg-plist.i386 ============================================================================== --- branches/2016Q4/emulators/linux_base-c7/pkg-plist.i386 Fri Nov 4 16:31:24 2016 (r425339) +++ branches/2016Q4/emulators/linux_base-c7/pkg-plist.i386 Fri Nov 4 16:39:35 2016 (r425340) @@ -2587,7 +2587,7 @@ var/mail @dir opt @dir(,,555) proc @dir srv -@dir sys +@dir(,,555) sys @dir usr/etc @dir usr/games @dir usr/include Modified: branches/2016Q4/emulators/linux_base-c7/pkg-plist.x86_64 ============================================================================== --- branches/2016Q4/emulators/linux_base-c7/pkg-plist.x86_64 Fri Nov 4 16:31:24 2016 (r425339) +++ branches/2016Q4/emulators/linux_base-c7/pkg-plist.x86_64 Fri Nov 4 16:39:35 2016 (r425340) @@ -3035,7 +3035,7 @@ var/mail @dir opt @dir(,,555) proc @dir srv -@dir sys +@dir(,,555) sys @dir usr/etc @dir usr/games @dir usr/include Modified: branches/2016Q4/emulators/linux_base-f10/Makefile ============================================================================== --- branches/2016Q4/emulators/linux_base-f10/Makefile Fri Nov 4 16:31:24 2016 (r425339) +++ branches/2016Q4/emulators/linux_base-f10/Makefile Fri Nov 4 16:39:35 2016 (r425340) @@ -3,7 +3,7 @@ PORTNAME= f10 PORTVERSION= ${LINUX_DIST_VER} -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= emulators linux PKGNAMEPREFIX= linux_base- Modified: branches/2016Q4/emulators/linux_base-f10/pkg-plist ============================================================================== --- branches/2016Q4/emulators/linux_base-f10/pkg-plist Fri Nov 4 16:31:24 2016 (r425339) +++ branches/2016Q4/emulators/linux_base-f10/pkg-plist Fri Nov 4 16:39:35 2016 (r425340) @@ -2528,7 +2528,7 @@ var/mail @dir usr/include @dir usr/games @dir usr/etc -@dir sys +@dir(,,555) sys @dir srv @dir selinux @dir(,,555) proc From owner-svn-ports-branches@freebsd.org Fri Nov 4 16:46:55 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 60765C30C3E; Fri, 4 Nov 2016 16:46:55 +0000 (UTC) (envelope-from jgh@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 mx1.freebsd.org (Postfix) with ESMTPS id 3D7B5C19; Fri, 4 Nov 2016 16:46:55 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA4GksgL024793; Fri, 4 Nov 2016 16:46:54 GMT (envelope-from jgh@FreeBSD.org) Received: (from jgh@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA4Gks2w024790; Fri, 4 Nov 2016 16:46:54 GMT (envelope-from jgh@FreeBSD.org) Message-Id: <201611041646.uA4Gks2w024790@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jgh set sender to jgh@FreeBSD.org using -f From: Jason Helfman Date: Fri, 4 Nov 2016 16:46:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425342 - in branches/2016Q4/dns/py-namebench: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Nov 2016 16:46:55 -0000 Author: jgh Date: Fri Nov 4 16:46:53 2016 New Revision: 425342 URL: https://svnweb.freebsd.org/changeset/ports/425342 Log: MFH: r425341 - unbreak fetch [1] - update WWW site - regen patch (pet portlint) Reported by: jswhitejrusa@gmail.com [1] Approved by: ports-secteam (with hat) Added: branches/2016Q4/dns/py-namebench/files/patch-libnamebench_util.py - copied unchanged from r425341, head/dns/py-namebench/files/patch-libnamebench_util.py Modified: branches/2016Q4/dns/py-namebench/Makefile branches/2016Q4/dns/py-namebench/distinfo branches/2016Q4/dns/py-namebench/pkg-descr Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/dns/py-namebench/Makefile ============================================================================== --- branches/2016Q4/dns/py-namebench/Makefile Fri Nov 4 16:41:39 2016 (r425341) +++ branches/2016Q4/dns/py-namebench/Makefile Fri Nov 4 16:46:53 2016 (r425342) @@ -5,8 +5,8 @@ PORTNAME= namebench PORTVERSION= 1.3.1 PORTREVISION= 1 CATEGORIES= dns python benchmarks -MASTER_SITES= GOOGLE_CODE \ - LOCAL/jgh/dns/ +MASTER_SITES= SF/bsdsrc/${PORTDIRNAME}/ \ + https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PORTNAME}/ \ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= ${PORTNAME}-${PORTVERSION}-source @@ -15,8 +15,6 @@ COMMENT= Open Source DNS benchmark utili LICENSE= APACHE20 -BROKEN= Unfetchable (google code has gone away) - RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.5.5:devel/py-Jinja2 \ ${PYTHON_PKGNAMEPREFIX}graphy>=1.0:graphics/py-graphy \ ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython \ Modified: branches/2016Q4/dns/py-namebench/distinfo ============================================================================== --- branches/2016Q4/dns/py-namebench/distinfo Fri Nov 4 16:41:39 2016 (r425341) +++ branches/2016Q4/dns/py-namebench/distinfo Fri Nov 4 16:46:53 2016 (r425342) @@ -1,2 +1,3 @@ +TIMESTAMP = 1478214460 SHA256 (namebench-1.3.1-source.tgz) = 30ccf9e870c1174c6bf02fca488f62bba280203a0b1e8e4d26f3756e1a5b9425 SIZE (namebench-1.3.1-source.tgz) = 1118505 Copied: branches/2016Q4/dns/py-namebench/files/patch-libnamebench_util.py (from r425341, head/dns/py-namebench/files/patch-libnamebench_util.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/dns/py-namebench/files/patch-libnamebench_util.py Fri Nov 4 16:46:53 2016 (r425342, copy of r425341, head/dns/py-namebench/files/patch-libnamebench_util.py) @@ -0,0 +1,11 @@ +--- libnamebench/util.py.orig 2016-11-04 16:13:39 UTC ++++ libnamebench/util.py +@@ -85,7 +85,7 @@ def FindDataFile(filename): + os.path.join(os.getcwd(), 'namebench.app', 'Contents', 'Resources'), + os.path.join(os.getcwd(), '..'), + os.path.join(sys.prefix, 'namebench'), +- '/usr/local/share/namebench' ++ '/usr/local/share/namebench', + '/usr/local/etc/namebench', + '/usr/local/namebench', + '/etc/namebench', Modified: branches/2016Q4/dns/py-namebench/pkg-descr ============================================================================== --- branches/2016Q4/dns/py-namebench/pkg-descr Fri Nov 4 16:41:39 2016 (r425341) +++ branches/2016Q4/dns/py-namebench/pkg-descr Fri Nov 4 16:46:53 2016 (r425342) @@ -2,4 +2,4 @@ An experiment in benchmarking DNS name s is designed to help you as a user determine what name services are the best to use for an individual machine. -WWW: http://namebench.googlecode.com/ +WWW: https://code.google.com/archive/p/namebench/ From owner-svn-ports-branches@freebsd.org Sat Nov 5 19:28:34 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8236BAF7A2A; Sat, 5 Nov 2016 19:28:34 +0000 (UTC) (envelope-from jbeich@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 mx1.freebsd.org (Postfix) with ESMTPS id 43D5724F; Sat, 5 Nov 2016 19:28:34 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA5JSXBC048441; Sat, 5 Nov 2016 19:28:33 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA5JSXHs048439; Sat, 5 Nov 2016 19:28:33 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201611051928.uA5JSXHs048439@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 5 Nov 2016 19:28:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r425439 - branches/2016Q4/multimedia/php-pHash/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Nov 2016 19:28:34 -0000 Author: jbeich Date: Sat Nov 5 19:28:33 2016 New Revision: 425439 URL: https://svnweb.freebsd.org/changeset/ports/425439 Log: MFH: r425436 multimedia/php-pHash: unbreak build with lang/php70 In file included from bindings/php/pHash.cpp:17: In file included from ./php_pHash.h:28: In file included from /usr/local/include/php/main/php.h:35: In file included from /usr/local/include/php/Zend/zend.h:36: bindings/php/pHash.cpp:51:36: error: unknown type name 'zend_rsrc_list_entry' extern "C" void ph_video_hash_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) ^ bindings/php/pHash.cpp:260:18: error: use of undeclared identifier 'ZEND_REGISTER_RESOURCE' return_res_id = ZEND_REGISTER_RESOURCE(return_value, return_res, le_ph_video_hash); ^ bindings/php/pHash.cpp:397:26: error: unexpected type name 'ulong64': expected expression ZEND_FETCH_RESOURCE(h1, ulong64 *, &h1_res, h1_resid, "ph_image_hash", le_ph_image_hash); ^ [...] PR: 213213 Submitted by: Naram Qashat (maintainer) Approved by: ports-secteam blanket Added: branches/2016Q4/multimedia/php-pHash/files/patch-php__pHash.h - copied unchanged from r425436, head/multimedia/php-pHash/files/patch-php__pHash.h Modified: branches/2016Q4/multimedia/php-pHash/files/patch-pHash.cpp Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/multimedia/php-pHash/files/patch-pHash.cpp ============================================================================== --- branches/2016Q4/multimedia/php-pHash/files/patch-pHash.cpp Sat Nov 5 19:27:10 2016 (r425438) +++ branches/2016Q4/multimedia/php-pHash/files/patch-pHash.cpp Sat Nov 5 19:28:33 2016 (r425439) @@ -1,6 +1,6 @@ --- pHash.cpp.orig 2013-04-23 18:54:02 UTC +++ pHash.cpp -@@ -36,12 +36,14 @@ struct ph_text_hash +@@ -36,17 +36,23 @@ struct ph_text_hash /* {{{ phpinfo logo definitions */ @@ -15,7 +15,52 @@ /* }}} */ /* {{{ Resource destructors */ -@@ -145,7 +147,9 @@ ZEND_GET_MODULE(pHash) + int le_ph_video_hash; ++#if PHP_VERSION_ID >= 70000 ++extern "C" void ph_video_hash_dtor(zend_resource *rsrc TSRMLS_DC) ++#else + extern "C" void ph_video_hash_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) ++#endif + { + ph_video_hash * resource = (ph_video_hash *)(rsrc->ptr); + +@@ -58,7 +64,11 @@ extern "C" void ph_video_hash_dtor(zend_ + } + + int le_ph_image_hash; ++#if PHP_VERSION_ID >= 70000 ++extern "C" void ph_image_hash_dtor(zend_resource *rsrc TSRMLS_DC) ++#else + extern "C" void ph_image_hash_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) ++#endif + { + ulong64 * resource = (ulong64 *)(rsrc->ptr); + +@@ -67,7 +77,11 @@ extern "C" void ph_image_hash_dtor(zend_ + } + + int le_ph_audio_hash; ++#if PHP_VERSION_ID >= 70000 ++extern "C" void ph_audio_hash_dtor(zend_resource *rsrc TSRMLS_DC) ++#else + extern "C" void ph_audio_hash_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) ++#endif + { + ph_audio_hash * resource = (ph_audio_hash *)(rsrc->ptr); + +@@ -79,7 +93,11 @@ extern "C" void ph_audio_hash_dtor(zend_ + } + + int le_ph_txt_hash; ++#if PHP_VERSION_ID >= 70000 ++extern "C" void ph_txt_hash_dtor(zend_resource *rsrc TSRMLS_DC) ++#else + extern "C" void ph_txt_hash_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) ++#endif + { + ph_text_hash * resource = (ph_text_hash *)(rsrc->ptr); + +@@ -145,7 +163,9 @@ ZEND_GET_MODULE(pHash) /* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(pHash) { @@ -25,7 +70,7 @@ le_ph_video_hash = zend_register_list_destructors_ex(ph_video_hash_dtor, NULL, "ph_video_hash", module_number); le_ph_image_hash = zend_register_list_destructors_ex(ph_image_hash_dtor, -@@ -165,7 +169,9 @@ PHP_MINIT_FUNCTION(pHash) +@@ -165,7 +185,9 @@ PHP_MINIT_FUNCTION(pHash) /* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(pHash) { @@ -35,7 +80,7 @@ /* add your stuff here */ -@@ -203,7 +209,9 @@ PHP_MINFO_FUNCTION(pHash) +@@ -203,7 +225,9 @@ PHP_MINFO_FUNCTION(pHash) if (SG(request_info).request_uri) { php_printf("%s", (SG(request_info).request_uri)); } @@ -45,3 +90,223 @@ php_printf("' align='right' alt='image' border='0'>\n"); php_printf("pHash\n"); +@@ -225,10 +249,12 @@ PHP_MINFO_FUNCTION(pHash) + PHP_FUNCTION(ph_dct_videohash) + { + ph_video_hash * return_res; ++#if PHP_VERSION_ID < 70000 + long return_res_id = -1; ++#endif + + const char * file = NULL; +- int file_len = 0; ++ SIZETorINT file_len = 0; + + + +@@ -249,7 +275,11 @@ PHP_FUNCTION(ph_dct_videohash) + else + RETURN_FALSE; + ++#if PHP_VERSION_ID >= 70000 ++ RETURN_RES(zend_register_resource(return_res, le_ph_video_hash)); ++#else + return_res_id = ZEND_REGISTER_RESOURCE(return_value, return_res, le_ph_video_hash); ++#endif + } + /* }}} ph_dct_videohash */ + +@@ -261,10 +291,12 @@ PHP_FUNCTION(ph_dct_videohash) + PHP_FUNCTION(ph_dct_imagehash) + { + ulong64 * return_res; ++#if PHP_VERSION_ID < 70000 + long return_res_id = -1; ++#endif + + const char * file = NULL; +- int file_len = 0; ++ SIZETorINT file_len = 0; + + + +@@ -282,7 +314,11 @@ PHP_FUNCTION(ph_dct_imagehash) + else + return_res = hash; + ++#if PHP_VERSION_ID >= 70000 ++ RETURN_RES(zend_register_resource(return_res, le_ph_image_hash)); ++#else + return_res_id = ZEND_REGISTER_RESOURCE(return_value, return_res, le_ph_image_hash); ++#endif + } + /* }}} ph_dct_imagehash */ + +@@ -293,10 +329,12 @@ PHP_FUNCTION(ph_dct_imagehash) + PHP_FUNCTION(ph_texthash) + { + ph_text_hash * return_res; ++#if PHP_VERSION_ID < 70000 + long return_res_id = -1; ++#endif + + const char * file = NULL; +- int file_len = 0; ++ SIZETorINT file_len = 0; + + + +@@ -316,7 +354,11 @@ PHP_FUNCTION(ph_texthash) + else + RETURN_FALSE; + ++#if PHP_VERSION_ID >= 70000 ++ RETURN_RES(zend_register_resource(return_res, le_ph_txt_hash)); ++#else + return_res_id = ZEND_REGISTER_RESOURCE(return_value, return_res, le_ph_txt_hash); ++#endif + } + /* }}} ph_texthash */ + +@@ -327,12 +369,14 @@ PHP_FUNCTION(ph_texthash) + PHP_FUNCTION(ph_audiohash) + { + ph_audio_hash * return_res; ++#if PHP_VERSION_ID < 70000 + long return_res_id = -1; ++#endif + + const char * file = NULL; +- int file_len = 0; +- long sample_rate = 5512; +- long channels = 1; ++ SIZETorINT file_len = 0; ++ zppLONG sample_rate = 5512; ++ zppLONG channels = 1; + + + +@@ -362,7 +406,11 @@ PHP_FUNCTION(ph_audiohash) + else + RETURN_FALSE; + ++#if PHP_VERSION_ID >= 70000 ++ RETURN_RES(zend_register_resource(return_res, le_ph_audio_hash)); ++#else + return_res_id = ZEND_REGISTER_RESOURCE(return_value, return_res, le_ph_audio_hash); ++#endif + } + /* }}} ph_audiohash */ + +@@ -386,8 +434,17 @@ PHP_FUNCTION(ph_image_dist) + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr", &h1_res, &h2_res) == FAILURE) { + return; + } ++#if PHP_VERSION_ID >= 70000 ++ if ((h1 = (ulong64 *)zend_fetch_resource2(Z_RES_P(h1_res), "ph_image_hash", h1_resid, le_ph_image_hash)) == NULL) { ++ RETURN_FALSE; ++ } ++ if ((h2 = (ulong64 *)zend_fetch_resource2(Z_RES_P(h2_res), "ph_image_hash", h2_resid, le_ph_image_hash)) == NULL) { ++ RETURN_FALSE; ++ } ++#else + ZEND_FETCH_RESOURCE(h1, ulong64 *, &h1_res, h1_resid, "ph_image_hash", le_ph_image_hash); + ZEND_FETCH_RESOURCE(h2, ulong64 *, &h2_res, h2_resid, "ph_image_hash", le_ph_image_hash); ++#endif + + + +@@ -415,15 +472,24 @@ PHP_FUNCTION(ph_video_dist) + int h2_resid = -1; + ph_video_hash * h2; + +- long thresh = 21; ++ zppLONG thresh = 21; + + + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr|l", &h1_res, &h2_res, &thresh) == FAILURE) { + return; + } ++#if PHP_VERSION_ID >= 70000 ++ if ((h1 = (ph_video_hash *)zend_fetch_resource2(Z_RES_P(h1_res), "ph_video_hash", h1_resid, le_ph_video_hash)) == NULL) { ++ RETURN_FALSE; ++ } ++ if ((h2 = (ph_video_hash *)zend_fetch_resource2(Z_RES_P(h2_res), "ph_video_hash", h2_resid, le_ph_video_hash)) == NULL) { ++ RETURN_FALSE; ++ } ++#else + ZEND_FETCH_RESOURCE(h1, ph_video_hash *, &h1_res, h1_resid, "ph_video_hash", le_ph_video_hash); + ZEND_FETCH_RESOURCE(h2, ph_video_hash *, &h2_res, h2_resid, "ph_video_hash", le_ph_video_hash); ++#endif + + + +@@ -452,7 +518,7 @@ PHP_FUNCTION(ph_audio_dist) + int h2_resid = -1; + ph_audio_hash * h2; + +- long block_size = 256; ++ zppLONG block_size = 256; + double thresh = 0.30; + + +@@ -460,8 +526,17 @@ PHP_FUNCTION(ph_audio_dist) + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr|ld", &h1_res, &h2_res, &block_size, &thresh) == FAILURE) { + return; + } ++#if PHP_VERSION_ID >= 70000 ++ if ((h1 = (ph_audio_hash *)zend_fetch_resource2(Z_RES_P(h1_res), "ph_audio_hash", h1_resid, le_ph_audio_hash)) == NULL) { ++ RETURN_FALSE; ++ } ++ if ((h2 = (ph_audio_hash *)zend_fetch_resource2(Z_RES_P(h2_res), "ph_audio_hash", h2_resid, le_ph_audio_hash)) == NULL) { ++ RETURN_FALSE; ++ } ++#else + ZEND_FETCH_RESOURCE(h1, ph_audio_hash *, &h1_res, h1_resid, "ph_audio_hash", le_ph_audio_hash); + ZEND_FETCH_RESOURCE(h2, ph_audio_hash *, &h2_res, h2_resid, "ph_audio_hash", le_ph_audio_hash); ++#endif + + + +@@ -510,8 +585,17 @@ PHP_FUNCTION(ph_compare_text_hashes) + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr", &h1_res, &h2_res) == FAILURE) { + return; + } ++#if PHP_VERSION_ID >= 70000 ++ if ((h1 = (ph_text_hash *)zend_fetch_resource2(Z_RES_P(h1_res), "ph_txt_hash", h1_resid, le_ph_txt_hash)) == NULL) { ++ RETURN_FALSE; ++ } ++ if ((h2 = (ph_text_hash *)zend_fetch_resource2(Z_RES_P(h2_res), "ph_txt_hash", h2_resid, le_ph_txt_hash)) == NULL) { ++ RETURN_FALSE; ++ } ++#else + ZEND_FETCH_RESOURCE(h1, ph_text_hash *, &h1_res, h1_resid, "ph_txt_hash", le_ph_txt_hash); + ZEND_FETCH_RESOURCE(h2, ph_text_hash *, &h2_res, h2_resid, "ph_txt_hash", le_ph_txt_hash); ++#endif + + + +@@ -525,6 +609,14 @@ PHP_FUNCTION(ph_compare_text_hashes) + { + for(int i = 0; i < count; ++i) + { ++#if PHP_VERSION_ID >= 70000 ++ zval array; ++ array_init(&array); ++ add_assoc_long(&array, "begin", m[i].first_index); ++ add_assoc_long(&array, "end", m[i].second_index); ++ add_assoc_long(&array, "length", m[i].length); ++ add_next_index_zval(return_value, &array); ++#else + zval *array; + MAKE_STD_ZVAL(array); + array_init(array); +@@ -532,6 +624,7 @@ PHP_FUNCTION(ph_compare_text_hashes) + add_assoc_long(array, "end", m[i].second_index); + add_assoc_long(array, "length", m[i].length); + add_next_index_zval(return_value, array); ++#endif + } + free(m); + } Copied: branches/2016Q4/multimedia/php-pHash/files/patch-php__pHash.h (from r425436, head/multimedia/php-pHash/files/patch-php__pHash.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/multimedia/php-pHash/files/patch-php__pHash.h Sat Nov 5 19:28:33 2016 (r425439, copy of r425436, head/multimedia/php-pHash/files/patch-php__pHash.h) @@ -0,0 +1,17 @@ +--- php_pHash.h.orig 2013-04-23 18:53:42 UTC ++++ php_pHash.h +@@ -170,6 +170,14 @@ ZEND_END_ARG_INFO() + #define ph_compare_text_hashes_arg_info NULL + #endif + ++#if PHP_VERSION_ID >= 70000 ++#define SIZETorINT size_t ++#define zppLONG zend_long ++#else ++#define SIZETorINT int ++#define zppLONG long ++#endif ++ + #ifdef __cplusplus + } // extern "C" + #endif