diff options
author | Rene Ladan <rene@FreeBSD.org> | 2019-05-31 18:42:07 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2019-05-31 18:42:07 +0000 |
commit | 104763fcf0a5d09f9ee3ce31a67e68182039df9a (patch) | |
tree | 01c1bfaca72ba14ffcf57c53d8e6efae3f93c55c /multimedia | |
parent | 3f4ab0dfb1abc20aa45ca0db028ce2a2affde812 (diff) | |
download | ports-104763fcf0a5d09f9ee3ce31a67e68182039df9a.tar.gz ports-104763fcf0a5d09f9ee3ce31a67e68182039df9a.zip |
Remove expired ports:
2019-05-31 multimedia/gmerlin-avdecoder: unused in the ports tree and depends on vulnerable multimedia/ffmpeg0
2019-05-31 security/racoon2-legacy: No longer supported upstream, use security/racoon2
2019-05-31 www/pivotx: inactive upstream and does not work with PHP 7
2019-05-31 dns/bind912: Support ends, please move to dns/bind914.
2019-05-31 multimedia/vdr-plugin-softhddevice: unmaintained and depends on vulnerable multimedia/ffmpeg0
Notes
Notes:
svn path=/head/; revision=503187
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/Makefile | 2 | ||||
-rw-r--r-- | multimedia/gmerlin-avdecoder/Makefile | 205 | ||||
-rw-r--r-- | multimedia/gmerlin-avdecoder/distinfo | 2 | ||||
-rw-r--r-- | multimedia/gmerlin-avdecoder/files/patch-lib-demux_ffmpeg.c | 25 | ||||
-rw-r--r-- | multimedia/gmerlin-avdecoder/files/patch-lib-libw32dll-wine-win32.c | 30 | ||||
-rw-r--r-- | multimedia/gmerlin-avdecoder/pkg-descr | 18 | ||||
-rw-r--r-- | multimedia/gmerlin-avdecoder/pkg-plist | 15 | ||||
-rw-r--r-- | multimedia/vdr-plugin-softhddevice/Makefile | 69 | ||||
-rw-r--r-- | multimedia/vdr-plugin-softhddevice/distinfo | 2 | ||||
-rw-r--r-- | multimedia/vdr-plugin-softhddevice/files/iatomic.h | 97 | ||||
-rw-r--r-- | multimedia/vdr-plugin-softhddevice/files/patch-Makefile | 79 | ||||
-rw-r--r-- | multimedia/vdr-plugin-softhddevice/files/patch-codec.c | 14 | ||||
-rw-r--r-- | multimedia/vdr-plugin-softhddevice/files/patch-softhddev.c | 49 | ||||
-rw-r--r-- | multimedia/vdr-plugin-softhddevice/files/patch-video.c | 12 | ||||
-rw-r--r-- | multimedia/vdr-plugin-softhddevice/pkg-descr | 18 | ||||
-rw-r--r-- | multimedia/vdr-plugin-softhddevice/pkg-plist | 1 |
16 files changed, 0 insertions, 638 deletions
diff --git a/multimedia/Makefile b/multimedia/Makefile index a5403ca03199..3b6251312432 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -81,7 +81,6 @@ SUBDIR += gdialog SUBDIR += gdvrecv SUBDIR += gmerlin - SUBDIR += gmerlin-avdecoder SUBDIR += gmimms SUBDIR += gmmlib SUBDIR += gmp-api @@ -437,7 +436,6 @@ SUBDIR += vdr-plugin-remote SUBDIR += vdr-plugin-skinenigmang SUBDIR += vdr-plugin-sleeptimer - SUBDIR += vdr-plugin-softhddevice SUBDIR += vdr-plugin-streamdev SUBDIR += vdr-plugin-ttxtsubs SUBDIR += vdr-plugin-vdrmanager diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile deleted file mode 100644 index 37a04b74c067..000000000000 --- a/multimedia/gmerlin-avdecoder/Makefile +++ /dev/null @@ -1,205 +0,0 @@ -# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= gmerlin-avdecoder -PORTVERSION= 1.2.0 -PORTREVISION= 25 -CATEGORIES= multimedia -MASTER_SITES= SF/gmerlin/${PORTNAME}/${PORTVERSION} - -MAINTAINER= wg@FreeBSD.org -COMMENT= General purpose media decoding library - -LICENSE= GPLv2 - -DEPRECATED= unused in the ports tree and depends on vulnerable multimedia/ffmpeg0 -EXPIRATION_DATE= 2019-05-31 - -BUILD_DEPENDS= ${LOCALBASE}/include/linux/dvb/frontend.h:multimedia/v4l_compat -LIB_DEPENDS= libgavl.so:multimedia/gavl - -OPTIONS_DEFINE= A52 CDIO DCA DVDREAD FAAD FFMPEG FLAC GMERLIN MAD \ - MJPEGTOOLS MPEG2 MUSEPACK OPENJPEG OPTIMIZED_CFLAGS PNG \ - SAMBA SCHROEDINGER SPEEX THEORA TIFF VDPAU VORBIS DOCS -OPTIONS_DEFAULT= A52 CDIO DCA DVDREAD FAAD FFMPEG FLAC GMERLIN MAD \ - MJPEGTOOLS MPEG2 MUSEPACK OPENJPEG OPTIMIZED_CFLAGS PNG \ - SAMBA SCHROEDINGER SPEEX THEORA TIFF VDPAU VORBIS -DVDREAD_DESC= libdvdread support -GMERLIN_DESC= gmerlin support -SAMBA_DESC= Samba support using libsmbclient - -USES= gettext libtool pathfix pkgconfig -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-cpuflags=none --without-doxygen -USE_LDCONFIG= yes - -CPPFLAGS+= -I${LOCALBASE}/include/ffmpeg0 -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib/ffmpeg0 -L${LOCALBASE}/lib - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MGMERLIN} -LIB_DEPENDS+= libgmerlin.so:multimedia/gmerlin -PLIST_SUB+= GMERLIN="" -.else -CONFIGURE_ARGS+=--disable-gmerlin -PLIST_SUB+= GMERLIN="@comment " -.endif - -.if ${PORT_OPTIONS:MFFMPEG} -LIB_DEPENDS+= libavcodec0.so:multimedia/ffmpeg0 -.else -CONFIGURE_ARGS+=--disable-libavcodec --disable-libpostproc --disable-libswscale --disable-libavformat -.endif - -.if ${PORT_OPTIONS:MTHEORA} -LIB_DEPENDS+= libtheora.so:multimedia/libtheora -.else -CONFIGURE_ARGS+=--disable-theoradec -.endif - -.if ${PORT_OPTIONS:MSPEEX} -LIB_DEPENDS+= libspeex.so:audio/speex -.else -CONFIGURE_ARGS+=--disable-speex -.endif - -.if ${PORT_OPTIONS:MMJPEGTOOLS} -LIB_DEPENDS+= liblavjpeg.so:multimedia/mjpegtools -.else -CONFIGURE_ARGS+=--disable-mjpegtools -.endif - -.if ${PORT_OPTIONS:MVORBIS} -LIB_DEPENDS+= libvorbis.so:audio/libvorbis -CONFIGURE_ARGS+=--with-vorbis=${LOCALBASE} -.else -CONFIGURE_ARGS+=--disable-vorbis -.endif - -.if ${PORT_OPTIONS:MMPEG2} -LIB_DEPENDS+= libmpeg2.so:multimedia/libmpeg2 -.else -CONFIGURE_ARGS+=--disable-libmpeg2 -.endif - -.if ${PORT_OPTIONS:MTIFF} -LIB_DEPENDS+= libtiff.so:graphics/tiff -.else -CONFIGURE_ARGS+=--disable-libtiff -.endif - -.if ${PORT_OPTIONS:MSAMBA} -USES+= samba:lib -CPPFLAGS+= -I${SAMBAINCLUDES} -LDFLAGS+= -L${SAMBALIBS} -.else -CONFIGURE_ARGS+=--disable-samba -.endif - -.if ${PORT_OPTIONS:MPNG} -LIB_DEPENDS+= libpng.so:graphics/png -.else -CONFIGURE_ARGS+=--disable-libpng -.endif - -.if ${PORT_OPTIONS:MFAAD} -LIB_DEPENDS+= libfaad.so:audio/faad -.else -CONFIGURE_ARGS+=--disable-faad2 -.endif - -.if ${PORT_OPTIONS:MDVDREAD} -LIB_DEPENDS+= libdvdread.so:multimedia/libdvdread -PLIST_SUB+= DVDREAD="" -.else -CONFIGURE_ARGS+=--disable-dvdread -PLIST_SUB+= DVDREAD="@comment " -.endif - -.if ${PORT_OPTIONS:MFLAC} -LIB_DEPENDS+= libFLAC.so:audio/flac -.else -CONFIGURE_ARGS+=--disable-flac -.endif - -.if ${PORT_OPTIONS:MMUSEPACK} -LIB_DEPENDS+= libmpcdec.so:audio/musepack -.else -CONFIGURE_ARGS+=--disable-musepack -.endif - -.if ${PORT_OPTIONS:MMAD} -LIB_DEPENDS+= libmad.so:audio/libmad -.else -CONFIGURE_ARGS+=--disable-mad -.endif - -.if ${PORT_OPTIONS:MA52} -LIB_DEPENDS+= liba52.so:audio/liba52 -.else -CONFIGURE_ARGS+=--disable-liba52 -.endif - -.if ${PORT_OPTIONS:MDCA} -LIB_DEPENDS+= libdca.so:multimedia/libdca -.else -# error in configure -CONFIGURE_ARGS+=--disable-libcda --disable-libdca -.endif - -.if ${PORT_OPTIONS:MCDIO} -LIB_DEPENDS+= libcdio.so:sysutils/libcdio -PLIST_SUB+= CDIO="" -.else -CONFIGURE_ARGS+=--disable-libcdio -PLIST_SUB+= CDIO="@comment " -.endif - -.if ${PORT_OPTIONS:MOPENJPEG} -LIB_DEPENDS+= libopenjpeg.so:graphics/openjpeg15 -.else -CONFIGURE_ARGS+=--disable-openjpeg -.endif - -.if ${PORT_OPTIONS:MSCHROEDINGER} -LIB_DEPENDS+= libschroedinger-1.0.so:multimedia/schroedinger -.else -CONFIGURE_ARGS+=--disable-schroedinger -.endif - -.if ${PORT_OPTIONS:MVDPAU} -LIB_DEPENDS+= libvdpau.so:multimedia/libvdpau -.else -CONFIGURE_ARGS+= --disable-vdpau -.endif - -# vendor ocflags from configure -.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} -CFLAGS+= -O3 -funroll-all-loops -ffast-math -CXXFLAGS+= -O3 -funroll-all-loops -ffast-math -.endif - -post-patch: - @${REINPLACE_CMD} -E -e \ - 's|-O3 -funroll-all-loops -ffast-math||g; \ - /LIBS/ s|-ldl||g; \ - s|^LDFLAGS="|&$${LDFLAGS} |' \ - -e 's|^(.*PKG_CONFIG.*)libavcodec(.*)|\1libavcodec0\2|g' \ - -e 's|^(.*PKG_CONFIG.*)libavformat(.*)|\1libavformat0\2|g' \ - -e 's|^(.*PKG_CONFIG.*)libavutil(.*)|\1libavutil0\2|g' \ - -e 's|^(.*PKG_CONFIG.*)libpostproc(.*)|\1libpostproc0\2|g' \ - -e 's|^(.*PKG_CONFIG.*)libswscale(.*)|\1libswscale0\2|g' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e \ - 's|#if DVDREAD_VERSION < 905|#if DVDREAD_VERSION < 904|' ${WRKSRC}/configure - @${REINPLACE_CMD} -e \ - '/^LIBS = / s|$$| @LIBINTL@ -lz|' ${WRKSRC}/tests/Makefile.in - @${REINPLACE_CMD} -e \ - 's|malloc.h|stdlib.h|' ${WRKSRC}/lib/in_smb.c - -post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/multimedia/gmerlin-avdecoder/distinfo b/multimedia/gmerlin-avdecoder/distinfo deleted file mode 100644 index 62b62c26031c..000000000000 --- a/multimedia/gmerlin-avdecoder/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (gmerlin-avdecoder-1.2.0.tar.gz) = 8e727fe0c9db6875bd71f3f4cac8e8feaca62d0ef1b26a86678241ecbed59afa -SIZE (gmerlin-avdecoder-1.2.0.tar.gz) = 1496378 diff --git a/multimedia/gmerlin-avdecoder/files/patch-lib-demux_ffmpeg.c b/multimedia/gmerlin-avdecoder/files/patch-lib-demux_ffmpeg.c deleted file mode 100644 index 51eddc5d9d46..000000000000 --- a/multimedia/gmerlin-avdecoder/files/patch-lib-demux_ffmpeg.c +++ /dev/null @@ -1,25 +0,0 @@ ---- lib/demux_ffmpeg.c.orig 2012-06-08 13:51:34.000000000 +0200 -+++ lib/demux_ffmpeg.c 2012-07-22 00:23:38.489505138 +0200 -@@ -774,15 +774,17 @@ - - /* Metadata */ - if(avfc->title[0]) -- ctx->tt->cur->metadata.title = bgav_strdup(avfc->title); -+ gavl_metadata_set(&ctx->tt->cur->metadata, GAVL_META_TITLE, avfc->title); - if(avfc->author[0]) -- ctx->tt->cur->metadata.author = bgav_strdup(avfc->author); -+ gavl_metadata_set(&ctx->tt->cur->metadata, GAVL_META_AUTHOR, avfc->author); - if(avfc->copyright[0]) -- ctx->tt->cur->metadata.copyright = bgav_strdup(avfc->copyright); -+ gavl_metadata_set(&ctx->tt->cur->metadata, GAVL_META_COPYRIGHT, avfc->copyright); - if(avfc->album[0]) -- ctx->tt->cur->metadata.album = bgav_strdup(avfc->album); -+ gavl_metadata_set(&ctx->tt->cur->metadata, GAVL_META_ALBUM, avfc->album); - if(avfc->genre[0]) -- ctx->tt->cur->metadata.genre = bgav_strdup(avfc->genre); -+ gavl_metadata_set(&ctx->tt->cur->metadata, GAVL_META_GENRE, avfc->genre); -+ if(avfc->track) -+ gavl_metadata_set_int(&ctx->tt->cur->metadata, GAVL_META_TRACKNUMBER, avfc->track); - - #endif - diff --git a/multimedia/gmerlin-avdecoder/files/patch-lib-libw32dll-wine-win32.c b/multimedia/gmerlin-avdecoder/files/patch-lib-libw32dll-wine-win32.c deleted file mode 100644 index aa3a74db95c6..000000000000 --- a/multimedia/gmerlin-avdecoder/files/patch-lib-libw32dll-wine-win32.c +++ /dev/null @@ -1,30 +0,0 @@ ---- lib/libw32dll/wine/win32.c.orig 2008-01-11 22:27:11.000000000 +0300 -+++ lib/libw32dll/wine/win32.c 2008-11-07 17:15:48.000000000 +0300 -@@ -61,27 +61,6 @@ - #include <kstat.h> - #endif - --#if HAVE_VSSCANF --# ifndef __sun --/* -- * On solaris, remove the prototype for now; it's incompatible with the one -- * from solaris9 stdio.h -- */ --int vsscanf( const char *str, const char *format, va_list ap); --# endif --#else --/* system has no vsscanf. try to provide one */ --static int vsscanf( const char *str, const char *format, va_list ap) --{ -- long p1 = va_arg(ap, long); -- long p2 = va_arg(ap, long); -- long p3 = va_arg(ap, long); -- long p4 = va_arg(ap, long); -- long p5 = va_arg(ap, long); -- return sscanf(str, format, p1, p2, p3, p4, p5); --} --#endif -- - char* win32_def_path = WIN32_PATH; - - static void do_cpuid(unsigned int ax, unsigned int *regs) diff --git a/multimedia/gmerlin-avdecoder/pkg-descr b/multimedia/gmerlin-avdecoder/pkg-descr deleted file mode 100644 index fabc098196b0..000000000000 --- a/multimedia/gmerlin-avdecoder/pkg-descr +++ /dev/null @@ -1,18 +0,0 @@ -Gmerlin_avdecoder is a general purpose media decoding library. It -was written as a support library for gmerlin, but it can also be -used by other applications. You don't even need gmerlin installed, -only gavl. Most of it was written completely from scratch, but the -sourcetrees of some other great software packages were used as -reference documentation. Credits go to the authors of Xine, MPlayer, -quicktime4linux and ffmpeg. - -Gmerlin_avdecoder is one of the most complete general purpose media -decoding libraries. The supported formats and codecs span a wide -range of applications from consumer level (mp3, divx etc.) to high -end production formats like 32 bit PCM and some professional -uncompressed video codecs. -Using gmerlin_avdecoder in your playback for transcoding application -means rock solid media format support with an ever growing list of -supported codecs and formats. - -WWW: http://gmerlin.sourceforge.net/ diff --git a/multimedia/gmerlin-avdecoder/pkg-plist b/multimedia/gmerlin-avdecoder/pkg-plist deleted file mode 100644 index c9ff0c7160c0..000000000000 --- a/multimedia/gmerlin-avdecoder/pkg-plist +++ /dev/null @@ -1,15 +0,0 @@ -bin/bgavdemux -bin/bgavdump -include/gmerlin/avdec.h -include/gmerlin/bgavdefs.h -include/gmerlin/bgav_version.h -%%GMERLIN%%lib/gmerlin/plugins/i_avdec.so -%%GMERLIN%%%%CDIO%%%%DVDREAD%%lib/gmerlin/plugins/i_dvd.so -%%GMERLIN%%lib/gmerlin/plugins/i_dvb.so -%%GMERLIN%%%%CDIO%%lib/gmerlin/plugins/i_vcd.so -lib/libgmerlin_avdec.so -lib/libgmerlin_avdec.so.1 -lib/libgmerlin_avdec.so.1.0.0 -libdata/pkgconfig/gmerlin_avdec.pc -%%PORTDOCS%%%%DOCSDIR%%/README -share/locale/de/LC_MESSAGES/gmerlin-avdecoder.mo diff --git a/multimedia/vdr-plugin-softhddevice/Makefile b/multimedia/vdr-plugin-softhddevice/Makefile deleted file mode 100644 index de1b20f5278d..000000000000 --- a/multimedia/vdr-plugin-softhddevice/Makefile +++ /dev/null @@ -1,69 +0,0 @@ -# Created by: Juergen Lock <nox@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= vdr-plugin-softhddevice -PORTVERSION= 0.5.1 -PORTREVISION= 15 -CATEGORIES= multimedia -MASTER_SITES= http://projects.vdr-developer.org/attachments/download/1000/ -DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Video Disk Recorder - softhddevice plugin - -LICENSE= AGPLv3 -LICENSE_FILE= ${WRKSRC}/AGPL-3.0.txt - -DEPRECATED= unmaintained and depends on vulnerable multimedia/ffmpeg0 -EXPIRATION_DATE= 2019-05-31 - -LIB_DEPENDS= libavcodec0.so:multimedia/ffmpeg0 \ - libvdpau.so:multimedia/libvdpau \ - libxcb-keysyms.so:x11/xcb-util-keysyms \ - libasound.so:audio/alsa-lib - -USES= compiler:features pkgconfig tar:tgz -USE_XORG= xv x11 xcb xinerama -USE_GL= gl glu -PATCH_STRIP= -p1 -CONFIG+= -DLOCALBASE=\\\"${LOCALBASE}\\\" -CONFIG+= -DUSE_VDPAU -CONFIG+= -DUSE_OSS -MAKE_ARGS= CONFIG="${CONFIG}" -WRKSRC= ${WRKDIR}/${PLUGIN}-${PORTVERSION} - -PORTDOCS= ChangeLog README.txt - -OPTIONS_DEFINE= VAAPI DOCS NLS -VAAPI_DESC= Enable vaapi support (experimental) - -VAAPI_LIB_DEPENDS= libva.so:multimedia/libva -VAAPI_VARS= CONFIG+=-DUSE_VAAPI - -.include "${.CURDIR}/../vdr/Makefile.plugins" - -.include <bsd.port.pre.mk> - -.if ${CHOSEN_COMPILER_TYPE} != clang -USE_GCC= yes -.endif - -post-patch: post-patch-plugin - @${REINPLACE_CMD} \ - -e 's,libavcodec,libavcodec0,g' \ - ${WRKSRC}/Makefile - @${CP} ${FILESDIR}/iatomic.h ${WRKSRC} - @${REINPLACE_CMD} \ - -e 's,<alsa/iatomic.h>,"iatomic.h",' \ - ${WRKSRC}/*.c ${WRKSRC}/*.cpp - -pre-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr - -post-install: post-install-pluginlocales - -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) - -.include <bsd.port.post.mk> diff --git a/multimedia/vdr-plugin-softhddevice/distinfo b/multimedia/vdr-plugin-softhddevice/distinfo deleted file mode 100644 index c658cbf97248..000000000000 --- a/multimedia/vdr-plugin-softhddevice/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (vdr/vdr-softhddevice-0.5.1.tgz) = 98012c6d9e341423b376d77e414d8bb5868576d6df549a311081ed94fa04bbf1 -SIZE (vdr/vdr-softhddevice-0.5.1.tgz) = 157741 diff --git a/multimedia/vdr-plugin-softhddevice/files/iatomic.h b/multimedia/vdr-plugin-softhddevice/files/iatomic.h deleted file mode 100644 index a7ab9a4d7707..000000000000 --- a/multimedia/vdr-plugin-softhddevice/files/iatomic.h +++ /dev/null @@ -1,97 +0,0 @@ -/// -/// @file iatomic.h @brief Misc function header file -/// -/// Copyright (c) 2014 by Johns. All Rights Reserved. -/// -/// Contributor(s): -/// -/// License: AGPLv3 -/// -/// This program is free software: you can redistribute it and/or modify -/// it under the terms of the GNU Affero General Public License as -/// published by the Free Software Foundation, either version 3 of the -/// License. -/// -/// This program is distributed in the hope that it will be useful, -/// but WITHOUT ANY WARRANTY; without even the implied warranty of -/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -/// GNU Affero General Public License for more details. -/// -/// $Id$ -////////////////////////////////////////////////////////////////////////////// - -/// @addtogroup iatomic -/// @{ - -#define GCC_VERSION (__GNUC__ * 10000 \ - + __GNUC_MINOR__ * 100 \ - + __GNUC_PATCHLEVEL__) - -// gcc before 4.7 didn't support atomic builtins, -// use alsa atomic functions. -#if 0 // GCC_VERSION < 40700 - -#include <alsa/iatomic.h> - -#else - -////////////////////////////////////////////////////////////////////////////// -// Defines -////////////////////////////////////////////////////////////////////////////// - -////////////////////////////////////////////////////////////////////////////// -// Declares -////////////////////////////////////////////////////////////////////////////// - -/// -/// atomic type, 24 bit useable, -/// -typedef volatile int atomic_t; - -////////////////////////////////////////////////////////////////////////////// -// Prototypes -////////////////////////////////////////////////////////////////////////////// - -////////////////////////////////////////////////////////////////////////////// -// Inlines -////////////////////////////////////////////////////////////////////////////// - -/// -/// Set atomic value. -/// -#define atomic_set(ptr, val) \ - __atomic_store_n(ptr, val, __ATOMIC_SEQ_CST) - -/// -/// Read atomic value. -/// -#define atomic_read(ptr) \ - __atomic_load_n(ptr, __ATOMIC_SEQ_CST) - -/// -/// Increment atomic value. -/// -#define atomic_inc(ptr) \ - __atomic_add_fetch(ptr, 1, __ATOMIC_SEQ_CST) - -/// -/// Decrement atomic value. -/// -#define atomic_dec(ptr) \ - __atomic_sub_fetch(ptr, 1, __ATOMIC_SEQ_CST) - -/// -/// Add to atomic value. -/// -#define atomic_add(val, ptr) \ - __atomic_add_fetch(ptr, val, __ATOMIC_SEQ_CST) - -/// -/// Subtract from atomic value. -/// -#define atomic_sub(val, ptr) \ - __atomic_sub_fetch(ptr, val, __ATOMIC_SEQ_CST) - -#endif - -/// @} diff --git a/multimedia/vdr-plugin-softhddevice/files/patch-Makefile b/multimedia/vdr-plugin-softhddevice/files/patch-Makefile deleted file mode 100644 index 56ebb35b5d3d..000000000000 --- a/multimedia/vdr-plugin-softhddevice/files/patch-Makefile +++ /dev/null @@ -1,79 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -41,8 +41,8 @@ CXXFLAGS ?= -g -O2 -W -Wall -Wextra -Wer - - ### The directory environment: - --VDRDIR ?= ../../.. --LIBDIR ?= ../../lib -+VDRDIR = /usr/local/include/vdr -+LIBDIR = ../lib - TMPDIR ?= /tmp - - ### Make sure that necessary options are included: -@@ -72,7 +72,7 @@ DEFINES += $(CONFIG) -D_GNU_SOURCE -DPLU - _CFLAGS = $(DEFINES) $(INCLUDES) \ - $(shell pkg-config --cflags libavcodec) \ - `pkg-config --cflags x11 x11-xcb xcb xcb-xv xcb-shm xcb-dpms xcb-atom\ -- xcb-screensaver xcb-randr xcb-glx xcb-icccm xcb-keysyms`\ -+ xcb-screensaver xcb-randr xcb-glx xcb-keysyms`\ - `pkg-config --cflags gl glu` \ - $(if $(findstring USE_VDPAU,$(CONFIG)), \ - `pkg-config --cflags vdpau`) \ -@@ -88,7 +88,7 @@ override CFLAGS += $(_CFLAGS) - LIBS += -lrt \ - $(shell pkg-config --libs libavcodec) \ - `pkg-config --libs x11 x11-xcb xcb xcb-xv xcb-shm xcb-dpms xcb-atom\ -- xcb-screensaver xcb-randr xcb-glx xcb-icccm xcb-keysyms`\ -+ xcb-screensaver xcb-randr xcb-glx xcb-keysyms`\ - `pkg-config --libs gl glu` \ - $(if $(findstring USE_VDPAU,$(CONFIG)), \ - `pkg-config --libs vdpau`) \ -@@ -113,7 +113,7 @@ all: libvdr-$(PLUGIN).so i18n - - ### Dependencies: - --MAKEDEP = $(CC) -MM -MG -+MAKEDEP = $(CC) -MM # # # -MG - DEPFILE = .dependencies - $(DEPFILE): Makefile - @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(SRCS) >$@ -@@ -125,7 +125,7 @@ $(OBJS): Makefile - ### Internationalization (I18N): - - PODIR = po --LOCALEDIR = $(VDRDIR)/locale -+LOCALEDIR = ../locale - I18Npo = $(wildcard $(PODIR)/*.po) - I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file)))))) - I18Npot = $(PODIR)/$(PLUGIN).pot -@@ -153,7 +153,11 @@ i18n: $(I18Nmsgs) $(I18Npot) - - libvdr-$(PLUGIN).so: $(OBJS) Makefile - $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -fPIC $(OBJS) -o $@ $(LIBS) -+ifdef FREEBSD -+ @cp -f $@ $(LIBDIR)/$@.$(APIVERSION) -+else - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) -+endif - - dist: $(I18Npo) clean - @-rm -rf $(TMPDIR)/$(ARCHIVE) -@@ -166,9 +170,17 @@ dist: $(I18Npo) clean - clean: - @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot - -+#install: libvdr-$(PLUGIN).so -+# cp --remove-destination libvdr-$(PLUGIN).so \ -+# /usr/lib/vdr/plugins/libvdr-$(PLUGIN).so.$(APIVERSION) -+ - install: libvdr-$(PLUGIN).so -+ifdef FREEBSD -+ ${INSTALL_PROGRAM} libvdr-$(PLUGIN).so ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) -+else - cp --remove-destination libvdr-$(PLUGIN).so \ - /usr/lib/vdr/plugins/libvdr-$(PLUGIN).so.$(APIVERSION) -+endif - - HDRS= $(wildcard *.h) - diff --git a/multimedia/vdr-plugin-softhddevice/files/patch-codec.c b/multimedia/vdr-plugin-softhddevice/files/patch-codec.c deleted file mode 100644 index 544ae8e27f41..000000000000 --- a/multimedia/vdr-plugin-softhddevice/files/patch-codec.c +++ /dev/null @@ -1,14 +0,0 @@ ---- a/codec.c -+++ b/codec.c -@@ -37,7 +37,11 @@ - - #include <stdio.h> - #include <unistd.h> -+#ifdef __FreeBSD__ -+#include <sys/endian.h> -+#else - #include <endian.h> -+#endif - - #include <sys/types.h> - #include <sys/stat.h> diff --git a/multimedia/vdr-plugin-softhddevice/files/patch-softhddev.c b/multimedia/vdr-plugin-softhddevice/files/patch-softhddev.c deleted file mode 100644 index ac0b02df7709..000000000000 --- a/multimedia/vdr-plugin-softhddevice/files/patch-softhddev.c +++ /dev/null @@ -1,49 +0,0 @@ ---- a/softhddev.c -+++ b/softhddev.c -@@ -22,6 +22,9 @@ - - #include <sys/types.h> - #include <sys/stat.h> -+#ifdef __FreeBSD__ -+#include <signal.h> -+#endif - #include <fcntl.h> - - #include <stdio.h> -@@ -2212,6 +2215,11 @@ int ProcessArgs(int argc, char *const ar - // - // Parse arguments. - // -+#ifdef __FreeBSD__ -+ if (!strcmp(*argv, "softhddevice")) -+ ++argv, --argc; -+#endif -+ - for (;;) { - switch (getopt(argc, argv, "-a:c:d:fg:p:sv:w:x")) { - case 'a': // audio device for pcm -@@ -2294,7 +2302,11 @@ int ProcessArgs(int argc, char *const ar - - #define XSERVER_MAX_ARGS 512 ///< how many arguments support - -+#ifndef __FreeBSD__ - static const char *X11Server = "/usr/bin/X"; ///< default x11 server -+#else -+static const char *X11Server = LOCALBASE "/bin/X"; ///< default x11 server -+#endif - static const char *X11ServerArguments; ///< default command arguments - static pid_t X11ServerPid; ///< x11 server pid - -@@ -2338,7 +2350,12 @@ static void StartXServer(void) - if ((sval = X11ServerArguments)) { - char *s; - -+#ifndef __FreeBSD__ - s = buf = strdupa(sval); -+#else -+ s = buf = alloca(strlen(sval) + 1); -+ strcpy(buf, sval); -+#endif - while ((sval = strsep(&s, " \t"))) { - args[argn++] = sval; - diff --git a/multimedia/vdr-plugin-softhddevice/files/patch-video.c b/multimedia/vdr-plugin-softhddevice/files/patch-video.c deleted file mode 100644 index a53d78cb8166..000000000000 --- a/multimedia/vdr-plugin-softhddevice/files/patch-video.c +++ /dev/null @@ -1,12 +0,0 @@ ---- a/video.c -+++ b/video.c -@@ -101,7 +101,9 @@ - //#include <xcb/xcb_image.h> - //#include <xcb/xcb_event.h> - #include <xcb/xcb_atom.h> -+#if 0 - #include <xcb/xcb_icccm.h> -+#endif - #ifdef XCB_ICCCM_NUM_WM_SIZE_HINTS_ELEMENTS - #include <xcb/xcb_ewmh.h> - #else // compatibility hack for old xcb-util diff --git a/multimedia/vdr-plugin-softhddevice/pkg-descr b/multimedia/vdr-plugin-softhddevice/pkg-descr deleted file mode 100644 index 0cfba9eb1b33..000000000000 --- a/multimedia/vdr-plugin-softhddevice/pkg-descr +++ /dev/null @@ -1,18 +0,0 @@ -A software and GPU emulated HD output device plugin for VDR. - - Video decoder CPU / VA-API / VDPAU - Video output VA-API / VDPAU - Audio FFMpeg / Alsa / Analog - Audio FFMpeg / Alsa / Digital - Audio FFMpeg / OSS / Analog - HDMI/SPDIF pass-through - YaepgHD support - Software deinterlacer Bob (VA-API only) - Autocrop - Grab image (VDPAU only) - Suspend - Letterbox, Stretch and Center cut-out video display modes - -Note: currently doesn't support XV, only VDPAU or (optionally) VAAPI - -WWW: https://projects.vdr-developer.org/projects/plg-softhddevice diff --git a/multimedia/vdr-plugin-softhddevice/pkg-plist b/multimedia/vdr-plugin-softhddevice/pkg-plist deleted file mode 100644 index 7b35d06d1ffc..000000000000 --- a/multimedia/vdr-plugin-softhddevice/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -lib/vdr/libvdr-softhddevice.so.%%APIVERSION%% |