Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 20 Nov 2018 18:55:43 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r485460 - in head: Mk mail/thunderbird mail/thunderbird/files www/firefox www/firefox-esr www/firefox-esr/files www/firefox/files www/palemoon www/seamonkey www/seamonkey/files
Message-ID:  <201811201855.wAKIthxx059969@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Tue Nov 20 18:55:42 2018
New Revision: 485460
URL: https://svnweb.freebsd.org/changeset/ports/485460

Log:
  gecko: drop system ogg/vorbis support
  
  Too infrequently updated to justify maintenance burden.

Deleted:
  head/mail/thunderbird/files/patch-sample-type
  head/mail/thunderbird/files/patch-z-bug517422
  head/www/firefox-esr/files/patch-sample-type
  head/www/firefox-esr/files/patch-z-bug517422
  head/www/firefox/files/patch-sample-type
  head/www/firefox/files/patch-z-bug517422
  head/www/seamonkey/files/patch-sample-type
  head/www/seamonkey/files/patch-z-bug517422
Modified:
  head/Mk/bsd.gecko.mk   (contents, props changed)
  head/mail/thunderbird/Makefile   (contents, props changed)
  head/www/firefox-esr/Makefile   (contents, props changed)
  head/www/firefox/Makefile   (contents, props changed)
  head/www/firefox/Makefile.options   (contents, props changed)
  head/www/palemoon/Makefile   (contents, props changed)
  head/www/seamonkey/Makefile   (contents, props changed)

Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk	Tue Nov 20 18:55:08 2018	(r485459)
+++ head/Mk/bsd.gecko.mk	Tue Nov 20 18:55:42 2018	(r485460)
@@ -167,15 +167,8 @@ MOZ_OPTIONS+=	--enable-jemalloc=4
 .endif # Mozilla < 55
 
 # Standard depends
-_ALL_DEPENDS=	cairo event ffi graphite harfbuzz hunspell icu jpeg nspr nss png pixman soundtouch sqlite vpx
+_ALL_DEPENDS=	cairo event ffi graphite harfbuzz hunspell icu jpeg nspr nss png pixman sqlite vpx
 
-.if ${PORT_OPTIONS:MINTEGER_SAMPLES}
-MOZ_EXPORT+=	MOZ_INTEGER_SAMPLES=1
-_ALL_DEPENDS+=	tremor
-.else
-_ALL_DEPENDS+=	vorbis
-.endif
-
 .if ! ${PORT_OPTIONS:MBUNDLED_CAIRO}
 cairo_BUILD_DEPENDS=cairo>=1.12.16_1,2:graphics/cairo
 cairo_LIB_DEPENDS=	libcairo.so:graphics/cairo
@@ -218,25 +211,8 @@ pixman_MOZ_OPTIONS=	--enable-system-pixman
 png_LIB_DEPENDS=	libpng.so:graphics/png
 png_MOZ_OPTIONS=	--with-system-png=${LOCALBASE}
 
-.if exists(${FILESDIR}/patch-z-bug517422)
-soundtouch_LIB_DEPENDS=	libSoundTouch.so:audio/soundtouch
-soundtouch_MOZ_OPTIONS=	--with-system-soundtouch
-.endif
-
 sqlite_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 sqlite_MOZ_OPTIONS=	--enable-system-sqlite
-
-.if exists(${FILESDIR}/patch-z-bug517422)
-# XXX disabled: update to 1.2.x or review backported fixes
-theora_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
-theora_MOZ_OPTIONS=	--with-system-theora
-
-tremor_LIB_DEPENDS=	libogg.so:audio/libogg libvorbisidec.so:audio/libtremor
-tremor_MOZ_OPTIONS=	--with-system-tremor --with-system-ogg
-
-vorbis_LIB_DEPENDS=	libogg.so:audio/libogg libvorbis.so:audio/libvorbis
-vorbis_MOZ_OPTIONS=	--with-system-vorbis --with-system-ogg
-.endif
 
 -vpx_BUILD_DEPENDS=	yasm:devel/yasm
 vpx_LIB_DEPENDS=	libvpx.so:multimedia/libvpx

Modified: head/mail/thunderbird/Makefile
==============================================================================
--- head/mail/thunderbird/Makefile	Tue Nov 20 18:55:08 2018	(r485459)
+++ head/mail/thunderbird/Makefile	Tue Nov 20 18:55:42 2018	(r485460)
@@ -3,7 +3,7 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	60.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail news net-im ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source
@@ -27,11 +27,10 @@ BUILD_DEPENDS=	nspr>=4.19:devel/nspr \
 		autoconf-2.13:devel/autoconf213 \
 		yasm:devel/yasm \
 		zip:archivers/zip
-#		soundtouch>=1.9.0:audio/soundtouch \
 
 SSP_UNSAFE=	yes
 USE_GECKO=	gecko
-USE_MOZILLA=	-cairo -soundtouch
+USE_MOZILLA=	-cairo
 
 USES=		tar:xz
 

Modified: head/www/firefox-esr/Makefile
==============================================================================
--- head/www/firefox-esr/Makefile	Tue Nov 20 18:55:08 2018	(r485459)
+++ head/www/firefox-esr/Makefile	Tue Nov 20 18:55:42 2018	(r485460)
@@ -3,7 +3,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	60.3.0
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
@@ -29,13 +29,12 @@ BUILD_DEPENDS=	nspr>=4.19:devel/nspr \
 		autoconf-2.13:devel/autoconf213 \
 		yasm:devel/yasm \
 		zip:archivers/zip
-#		soundtouch>=1.9.0:audio/soundtouch \
 
 USE_GECKO=	gecko
 CPE_PRODUCT=	${PORTNAME}_esr
 CONFLICTS_INSTALL=	firefox
 MOZ_PKGCONFIG_FILES=	# empty
-USE_MOZILLA=	-cairo -soundtouch
+USE_MOZILLA=	-cairo
 
 USES=		tar:xz
 

Modified: head/www/firefox/Makefile
==============================================================================
--- head/www/firefox/Makefile	Tue Nov 20 18:55:08 2018	(r485459)
+++ head/www/firefox/Makefile	Tue Nov 20 18:55:42 2018	(r485460)
@@ -3,7 +3,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	63.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
@@ -28,12 +28,11 @@ BUILD_DEPENDS=	nspr>=4.19:devel/nspr \
 		autoconf-2.13:devel/autoconf213 \
 		yasm:devel/yasm \
 		zip:archivers/zip
-#		soundtouch>=1.9.0:audio/soundtouch \
 
 USE_GECKO=	gecko
 CONFLICTS_INSTALL=	firefox-esr
 MOZ_PKGCONFIG_FILES=	# empty
-USE_MOZILLA=	-cairo -hunspell -soundtouch
+USE_MOZILLA=	-cairo -hunspell
 
 USES=		tar:xz
 

Modified: head/www/firefox/Makefile.options
==============================================================================
--- head/www/firefox/Makefile.options	Tue Nov 20 18:55:08 2018	(r485459)
+++ head/www/firefox/Makefile.options	Tue Nov 20 18:55:42 2018	(r485460)
@@ -1,12 +1,10 @@
 # -*- makefile-bsdmake -*-
 
 OPTIONS_DEFINE+= 	BUNDLED_CAIRO CANBERRA DBUS DEBUG DTRACE FFMPEG GCONF \
-			INTEGER_SAMPLES LIBPROXY \
-			OPTIMIZED_CFLAGS PROFILE TEST WAYLAND
+			LIBPROXY OPTIMIZED_CFLAGS PROFILE TEST WAYLAND
 
 OPTIONS_DEFAULT+=	DBUS FFMPEG GCONF OPTIMIZED_CFLAGS PROFILE WAYLAND \
-			${OPTIONS_MULTI_AUDIO:NSNDIO} \
-			${MACHINE_CPU:Msoftfp:C/.+/INTEGER_SAMPLES/}
+			${OPTIONS_MULTI_AUDIO:NSNDIO}
 
 OPTIONS_MULTI+=		AUDIO
 OPTIONS_MULTI_AUDIO=	ALSA JACK PULSEAUDIO SNDIO
@@ -27,7 +25,6 @@ OPTIONS_DEFAULT_i386+=	DTRACE
 
 BUNDLED_CAIRO_DESC?=	Use bundled fork of cairo-1.9.5
 CANBERRA_DESC?=		Sound theme alerts
-INTEGER_SAMPLES_DESC?=	Integer audio sample format
 LIBPROXY_DESC?=		Proxy support via libproxy
 LIGHTNING_DESC?=	Calendar extension
 RUST_DESC?=		Build with components written in Rust language

Modified: head/www/palemoon/Makefile
==============================================================================
--- head/www/palemoon/Makefile	Tue Nov 20 18:55:08 2018	(r485459)
+++ head/www/palemoon/Makefile	Tue Nov 20 18:55:42 2018	(r485460)
@@ -29,7 +29,7 @@ GH_PROJECT=	Pale-Moon
 
 USE_GECKO=	gecko
 MOZ_PKGCONFIG_FILES=	# empty
-USE_MOZILLA=	-soundtouch
+USE_MOZILLA=	# empty
 
 PM_ICON=	${PORTNAME}.png
 PM_ICON_SRC=	${PREFIX}/lib/${PORTNAME}/browser/icons/mozicon128.png
@@ -40,7 +40,7 @@ MOZ_OPTIONS=	--enable-application=browser \
 		--enable-jemalloc-lib
 
 OPTIONS_DEFAULT=	BUNDLED_CAIRO GTK2
-OPTIONS_EXCLUDE=	DTRACE INTEGER_SAMPLES JACK TEST WAYLAND
+OPTIONS_EXCLUDE=	DTRACE JACK TEST WAYLAND
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 

Modified: head/www/seamonkey/Makefile
==============================================================================
--- head/www/seamonkey/Makefile	Tue Nov 20 18:55:08 2018	(r485459)
+++ head/www/seamonkey/Makefile	Tue Nov 20 18:55:42 2018	(r485460)
@@ -3,7 +3,7 @@
 
 PORTNAME=	seamonkey
 DISTVERSION=	2.49.4
-PORTREVISION=	16
+PORTREVISION=	17
 MOZILLA_VER=	52 # above + 3
 CATEGORIES?=	www mail news editors irc ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
@@ -27,7 +27,6 @@ BUILD_DEPENDS=	nspr>=4.13.1:devel/nspr \
 		autoconf-2.13:devel/autoconf213 \
 		yasm:devel/yasm \
 		zip:archivers/zip
-#		soundtouch>=1.9.0:audio/soundtouch \
 
 LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 
@@ -38,7 +37,7 @@ MOZ_PIS_SCRIPTS=	moz_pis_S50cleanhome
 
 MOZ_OPTIONS+=	--enable-application=suite
 
-USE_MOZILLA=	-soundtouch
+USE_MOZILLA=	# empty
 MOZ_PKGCONFIG_FILES=
 
 OPTIONS_DEFINE=	LDAP LIGHTNING RUST



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811201855.wAKIthxx059969>