From owner-svn-ports-all@freebsd.org Sun May 10 16:50:50 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9A35F2EC975; Sun, 10 May 2020 16:50:50 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49Kqnk3Jlzz4PKw; Sun, 10 May 2020 16:50:50 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 53EAE847B; Sun, 10 May 2020 16:50:50 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04AGooUB072436; Sun, 10 May 2020 16:50:50 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04AGonWU072433; Sun, 10 May 2020 16:50:49 GMT (envelope-from pi@FreeBSD.org) Message-Id: <202005101650.04AGonWU072433@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sun, 10 May 2020 16:50:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r534856 - in head/multimedia/butt: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pi X-SVN-Commit-Paths: in head/multimedia/butt: . files X-SVN-Commit-Revision: 534856 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 May 2020 16:50:50 -0000 Author: pi Date: Sun May 10 16:50:49 2020 New Revision: 534856 URL: https://svnweb.freebsd.org/changeset/ports/534856 Log: multimedia/butt: update 0.1.18 -> 0.1.20 - added SSL/TLS support for icecast, among other things Submitted by: Per Gunnarsson Relnotes: https://danielnoethen.de/butt/Changelog.html Modified: head/multimedia/butt/Makefile head/multimedia/butt/distinfo head/multimedia/butt/files/patch-configure.ac head/multimedia/butt/files/patch-src_Makefile.am Modified: head/multimedia/butt/Makefile ============================================================================== --- head/multimedia/butt/Makefile Sun May 10 16:49:36 2020 (r534855) +++ head/multimedia/butt/Makefile Sun May 10 16:50:49 2020 (r534856) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= butt -PORTVERSION= 0.1.18 -PORTREVISION= 1 +PORTVERSION= 0.1.20 CATEGORIES= multimedia graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -24,7 +23,7 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \ libsamplerate.so:audio/libsamplerate \ libvorbis.so:audio/libvorbis -USES= autoreconf compiler:c++11-lang gmake jpeg pkgconfig xorg +USES= autoreconf compiler:c++11-lang gmake jpeg pkgconfig xorg ssl uidfix USE_XORG= x11 xrender xcursor xfixes xext xft xinerama GNU_CONFIGURE= yes Modified: head/multimedia/butt/distinfo ============================================================================== --- head/multimedia/butt/distinfo Sun May 10 16:49:36 2020 (r534855) +++ head/multimedia/butt/distinfo Sun May 10 16:50:49 2020 (r534856) @@ -1,3 +1,3 @@ -TIMESTAMP = 1562349284 -SHA256 (butt-0.1.18.tar.gz) = e812b4058a85c7de3733ff85f513e24891afe541eac399cba535b44490c00595 -SIZE (butt-0.1.18.tar.gz) = 968135 +TIMESTAMP = 1589118346 +SHA256 (butt-0.1.20.tar.gz) = e3f75fc2740bd92801d737f1985f5d662922f4c1f4c76eb0be6d75fe9758c70f +SIZE (butt-0.1.20.tar.gz) = 986757 Modified: head/multimedia/butt/files/patch-configure.ac ============================================================================== --- head/multimedia/butt/files/patch-configure.ac Sun May 10 16:49:36 2020 (r534855) +++ head/multimedia/butt/files/patch-configure.ac Sun May 10 16:50:49 2020 (r534856) @@ -1,6 +1,6 @@ ---- configure.ac.orig 2019-05-12 09:03:53 UTC +--- configure.ac.orig 2020-04-20 14:40:46 UTC +++ configure.ac -@@ -61,6 +61,7 @@ AM_CONDITIONAL(WINDOWS, test "$host_os" = "windows") +@@ -64,6 +64,7 @@ AM_CONDITIONAL(WINDOWS, test "$host_os" = "windows") build_linux=no @@ -8,37 +8,44 @@ build_windows=no build_mac=no -@@ -75,6 +76,15 @@ case "${host_os}" in +@@ -88,6 +89,25 @@ case "${host_os}" in ) ]) ;; -+ freebsd*) ++ freebsd*) + build_freebsd=yes + AC_MSG_NOTICE([FreeBSD detected]) -+ AS_IF([test "x$enable_aac" != "xno"], [ ++ ++ AS_IF([test "x$enable_aac" != "xno"], ++ [ + AC_CHECK_LIB([fdk-aac], [aacEncOpen], [], + [AC_MSG_ERROR([**** Could not find libfdk-aac ****])] ++ ) ++ ]) ++ AS_IF([test "x$enable_ssl" != "xno"], [ ++ AC_CHECK_LIB([crypto], [EVP_EncryptInit], [], ++ [AC_MSG_ERROR([**** Could not find libcrypto ****])] + ) ++ AC_CHECK_LIB([ssl], [SSL_CTX_new], [], ++ [AC_MSG_ERROR([**** Could not find libssl ****])] ++ ) + ]) + ;; cygwin*|mingw*|windows) build_windows=yes AC_MSG_NOTICE([Windows detected]) -@@ -90,6 +100,7 @@ esac +@@ -109,6 +129,7 @@ esac # Pass the conditionals to automake AM_CONDITIONAL([LINUX], [test "$build_linux" = "yes"]) -+AM_CONDITIONAL([FREEBSD], [test "$build_freebsd" = "yes"]) ++AM_CONDITIONAL([FreeBSD], [test "$build_freebsd" = "yes"]) AM_CONDITIONAL([WINDOWS], [test "$build_windows" = "yes"]) AM_CONDITIONAL([OSX], [test "$build_mac" = "yes"]) -@@ -121,6 +132,21 @@ if test "$build_linux" = "yes"; then - AC_MSG_ERROR([**** Coud not find dbus dev files]) - ]) - fi -+ -+#Add dbus library for FreeBSD -+if test "$build_freebsd" = "yes"; then +@@ -129,6 +150,20 @@ fi + + #Add dbus library for Linux + if test "$build_linux" = "yes"; then + AC_MSG_NOTICE([]) + PKG_CHECK_MODULES([DBUS], [dbus-1], [ + AC_DEFINE([HAVE_DBUS], [1], [Use dbus to get current tracks]) @@ -51,6 +58,8 @@ + ]) +fi + - - # Checks for header files. - AC_PATH_X ++#Add dbus library for FreeBSD ++if test "$build_freebsd" = "yes"; then + AC_MSG_NOTICE([]) + PKG_CHECK_MODULES([DBUS], [dbus-1], [ + AC_DEFINE([HAVE_DBUS], [1], [Use dbus to get current tracks]) Modified: head/multimedia/butt/files/patch-src_Makefile.am ============================================================================== --- head/multimedia/butt/files/patch-src_Makefile.am Sun May 10 16:49:36 2020 (r534855) +++ head/multimedia/butt/files/patch-src_Makefile.am Sun May 10 16:50:49 2020 (r534856) @@ -1,10 +1,10 @@ ---- src/Makefile.am.orig 2019-04-21 18:20:26 UTC +--- src/Makefile.am.orig 2020-04-21 11:35:33 UTC +++ src/Makefile.am @@ -34,6 +34,10 @@ if LINUX butt_SOURCES += currentTrack.h currentTrackLinux.cpp endif -+if FREEBSD ++if FreeBSD +butt_SOURCES += currentTrack.h currentTrackLinux.cpp +endif +