Date: Mon, 25 Feb 2019 13:01:06 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493856 - in head/multimedia: avidemux gmerlin libxine mpeg4ip Message-ID: <201902251301.x1PD16Rp043676@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Feb 25 13:01:06 2019 New Revision: 493856 URL: https://svnweb.freebsd.org/changeset/ports/493856 Log: First step at deorbitting esound: remove esound options where it is possible to, category multimedia Modified: head/multimedia/avidemux/Makefile.common head/multimedia/gmerlin/Makefile head/multimedia/gmerlin/pkg-plist head/multimedia/libxine/Makefile head/multimedia/libxine/pkg-plist head/multimedia/mpeg4ip/Makefile Modified: head/multimedia/avidemux/Makefile.common ============================================================================== --- head/multimedia/avidemux/Makefile.common Mon Feb 25 12:53:00 2019 (r493855) +++ head/multimedia/avidemux/Makefile.common Mon Feb 25 13:01:06 2019 (r493856) @@ -25,6 +25,7 @@ DOS2UNIX_FILES= cmake/admCheckMiscLibs.cmake \ CMAKE_ARGS+= -DGNUMAKE_EXECUTABLE=gmake CMAKE_ARGS+= -DAVIDEMUX_PACKAGER=none CMAKE_ARGS+= -DQT5:BOOL=OFF +CMAKE_ARGS+= -DESD:BOOL=OFF CXXFLAGS+= -I${LOCALBASE}/include MAKE_JOBS_UNSAFE= yes NOPRECIOUSMAKEVARS= yes # ARCH @@ -33,7 +34,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin -OPTIONS_DEFINE= QT4 CLI FREETYPE FONTCONFIG OSS ESOUND JACK \ +OPTIONS_DEFINE= QT4 CLI FREETYPE FONTCONFIG OSS JACK \ PULSEAUDIO XVIDEO FAAC FRIBIDI OPUS TWOLAME \ FAAD X264 X265 VPX XVID SDL AMR VORBIS NLS LAME VAAPI VDPAU OPTIONS_DEFAULT= FREETYPE FONTCONFIG OSS XVIDEO VPX XVID \ @@ -115,14 +116,6 @@ PLIST_SUB+= CLI="@comment " CMAKE_ARGS+= -DOSS_SUPPORT:BOOL=ON .else CMAKE_ARGS+= -DOSS_SUPPORT:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MESOUND} -USE_GNOME+= esound -PLIST_SUB+= ESD="" -.else -CMAKE_ARGS+= -DESD:BOOL=OFF -PLIST_SUB+= ESD="@comment " .endif .if ${PORT_OPTIONS:MJACK} Modified: head/multimedia/gmerlin/Makefile ============================================================================== --- head/multimedia/gmerlin/Makefile Mon Feb 25 12:53:00 2019 (r493855) +++ head/multimedia/gmerlin/Makefile Mon Feb 25 13:01:06 2019 (r493856) @@ -24,7 +24,8 @@ USE_GL= gl GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_func_inotify_init=no CONFIGURE_ARGS= --disable-v4l --disable-v4l2 --disable-v4lconvert \ - --without-doxygen --with-cpuflags=none --disable-musicbrainz + --without-doxygen --with-cpuflags=none --disable-musicbrainz \ + --disable-esd USE_LDCONFIG= yes LLD_UNSAFE= yes INSTALL_TARGET= install-strip @@ -36,7 +37,7 @@ LDFLAGS+= -Wl,--add-needed INFO= gmerlin -OPTIONS_DEFINE= ALSA CDDB CDIO ESOUND JACK JPEG LIBVISUAL \ +OPTIONS_DEFINE= ALSA CDDB CDIO JACK JPEG LIBVISUAL \ OPTIMIZED_CFLAGS PNG PULSEAUDIO QUICKTIME TIFF DOCS OPTIONS_DEFAULT= CDDB JACK JPEG LIBVISUAL \ OPTIMIZED_CFLAGS PNG PULSEAUDIO QUICKTIME TIFF @@ -49,8 +50,6 @@ CDDB_CONFIGURE_OFF= --disable-cddb CDIO_LIB_DEPENDS= libcdio.so:sysutils/libcdio \ libcdio_cdda.so:sysutils/libcdio-paranoia CDIO_CONFIGURE_OFF= --disable-libcdio -ESOUND_USE= gnome=esound -ESOUND_CONFIGURE_OFF= --disable-esd JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CONFIGURE_OFF= --disable-jack JPEG_USES= jpeg Modified: head/multimedia/gmerlin/pkg-plist ============================================================================== --- head/multimedia/gmerlin/pkg-plist Mon Feb 25 12:53:00 2019 (r493855) +++ head/multimedia/gmerlin/pkg-plist Mon Feb 25 13:01:06 2019 (r493856) @@ -124,7 +124,6 @@ lib/gmerlin/plugins/fv_zoom.so %%ALSA%%lib/gmerlin/plugins/i_alsa.so %%CDIO%%lib/gmerlin/plugins/i_cdaudio.so lib/gmerlin/plugins/i_edl.so -%%ESOUND%%lib/gmerlin/plugins/i_esd.so %%JACK%%lib/gmerlin/plugins/i_jack.so %%QUICKTIME%%lib/gmerlin/plugins/i_lqt.so lib/gmerlin/plugins/i_mikmod.so @@ -146,7 +145,6 @@ lib/gmerlin/plugins/iw_pnm.so lib/gmerlin/plugins/iw_tga.so %%TIFF%%lib/gmerlin/plugins/iw_tiff.so %%ALSA%%lib/gmerlin/plugins/oa_alsa.so -%%ESOUND%%lib/gmerlin/plugins/oa_esd.so %%JACK%%lib/gmerlin/plugins/oa_jack.so lib/gmerlin/plugins/oa_oss.so %%PULSEAUDIO%%lib/gmerlin/plugins/oa_pulse.so Modified: head/multimedia/libxine/Makefile ============================================================================== --- head/multimedia/libxine/Makefile Mon Feb 25 12:53:00 2019 (r493855) +++ head/multimedia/libxine/Makefile Mon Feb 25 13:01:06 2019 (r493856) @@ -3,7 +3,7 @@ PORTNAME= xine PORTVERSION= 1.2.9 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia ipv6 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION} PKGNAMEPREFIX= lib @@ -54,6 +54,7 @@ CONFIGURE_ARGS= --with-libflac \ --disable-real-codecs \ --disable-v4l \ --without-alsa \ + --without-esound \ --disable-musepack MAKE_ENV= V=1 @@ -69,7 +70,7 @@ DOCSDIR= ${PREFIX}/share/doc/xine-lib PLUGINSDIR= lib/xine/plugins/2.7 PLIST_SUB= PLUGINSDIR="${PLUGINSDIR}" -OPTIONS_DEFINE= DOCS NLS CACA DVB DMX_IMAGE ESOUND IPV6 IMAGEMAGICK JACK \ +OPTIONS_DEFINE= DOCS NLS CACA DVB DMX_IMAGE IPV6 IMAGEMAGICK JACK \ GNOMEVFS2 PIXBUF PULSEAUDIO XVMC SMB SNDIO AALIB WAVPACK \ VAAPI LIBBLURAY OPTIONS_DEFAULT= DVB PIXBUF VAAPI @@ -86,8 +87,6 @@ AALIB_CONFIGURE_ENABLE= aalib CACA_LIB_DEPENDS= libcaca.so:graphics/libcaca CACA_CONFIGURE_WITH= caca DVB_CONFIGURE_ENABLE= dvb -ESOUND_USE= GNOME=esound -ESOUND_CONFIGURE_WITH= esound GNOMEVFS2_USE= GNOME=glib20,gconf2,gnomevfs2 GNOMEVFS2_CONFIGURE_ENABLE= gnomevfs IMAGEMAGICK_CONFIGURE_WITH= imagemagick Modified: head/multimedia/libxine/pkg-plist ============================================================================== --- head/multimedia/libxine/pkg-plist Mon Feb 25 12:53:00 2019 (r493855) +++ head/multimedia/libxine/pkg-plist Mon Feb 25 13:01:06 2019 (r493856) @@ -54,7 +54,6 @@ lib/libxine.so.2.7.0 %%PLUGINSDIR%%/post/xineplug_post_switch.so %%PLUGINSDIR%%/post/xineplug_post_tvtime.so %%PLUGINSDIR%%/post/xineplug_post_visualizations.so -%%ESOUND%%%%PLUGINSDIR%%/xineplug_ao_out_esd.so %%JACK%%%%PLUGINSDIR%%/xineplug_ao_out_jack.so %%PLUGINSDIR%%/xineplug_ao_out_oss.so %%PULSEAUDIO%%%%PLUGINSDIR%%/xineplug_ao_out_pulseaudio.so Modified: head/multimedia/mpeg4ip/Makefile ============================================================================== --- head/multimedia/mpeg4ip/Makefile Mon Feb 25 12:53:00 2019 (r493855) +++ head/multimedia/mpeg4ip/Makefile Mon Feb 25 13:01:06 2019 (r493856) @@ -3,7 +3,7 @@ PORTNAME= mpeg4ip PORTVERSION= 1.6.1 -PORTREVISION= 43 +PORTREVISION= 44 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= LOCAL/ahze # http://sourceforge.net/forum/forum.php?thread_id=1839453&forum_id=59136 @@ -37,7 +37,7 @@ CONFIGURE_ARGS= --enable-ffmpeg=${LOCALBASE} \ --enable-mp4live \ --disable-static -OPTIONS_DEFINE= ESOUND IPV6 NAS OPTIMIZED_CFLAGS XVID DOCS +OPTIONS_DEFINE= IPV6 NAS OPTIMIZED_CFLAGS XVID DOCS OPTIONS_DEFAULT= XVID DOC_FILES= ${PORTDOCS} @@ -48,13 +48,6 @@ PORTDOCS= MAINREADME.html MP4LIVE_INTERNALS.html MPEG4 .include <bsd.port.options.mk> -### -## Auto detect possible extensions -### -# esound -.if exists(${LOCALBASE}/bin/esd-config) && empty(PORT_OPTIONS:MESOUND) -PORT_OPTIONS+= ESOUND -.endif # nas .if exists(${LOCALBASE}/lib/libaudio.so) && empty(PORT_OPTIONS:MNAS) PORT_OPTIONS+= NAS @@ -64,13 +57,6 @@ PORT_OPTIONS+= NAS PORT_OPTIONS+= XVID .endif -### -## Enable extensions based on user choices -### -# esound -.if ${PORT_OPTIONS:MESOUND} -USE_GNOME+= esound -.endif # nas .if ${PORT_OPTIONS:MNAS} LIB_DEPENDS+= libaudio.so:audio/nas
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902251301.x1PD16Rp043676>