pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

mplayer-*: remove defunct packages



Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Mon Jul 25 02:44:38 2022 +0200
Changeset:	aed7acdecbeadfeea31e02d330130bd1661c90df

Modified Files:
	Makefile
Removed Files:
	mplayer-mt/DESCR
	mplayer-mt/Makefile
	mplayer-mt/Makefile.common
	mplayer-mt/Makefile.depends
	mplayer-mt/PLIST
	mplayer-mt/distinfo
	mplayer-mt/options.mk
	mplayer-mt/patches/patch-aa
	mplayer-snapshot-share/DESCR
	mplayer-snapshot-share/Makefile
	mplayer-snapshot-share/Makefile.cflags
	mplayer-snapshot-share/Makefile.common
	mplayer-snapshot-share/Makefile.depends
	mplayer-snapshot-share/PLIST
	mplayer-snapshot-share/distinfo
	mplayer-snapshot-share/options.mk
	mplayer-snapshot-share/patches/patch-aa
	mplayer-snapshot-share/patches/patch-ac
	mplayer-snapshot-share/patches/patch-ae
	mplayer-snapshot-share/patches/patch-ag
	mplayer-snapshot-share/patches/patch-ah
	mplayer-snapshot-share/patches/patch-an
	mplayer-snapshot-share/patches/patch-ar
	mplayer-snapshot-share/patches/patch-vb
	mplayer-snapshot-share/patches/patch-ve_x264
	mplayer-snapshot/DESCR
	mplayer-snapshot/Makefile
	mplayer-snapshot/PLIST

Log Message:
mplayer-*: remove defunct packages

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=aed7acdecbeadfeea31e02d330130bd1661c90df

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                     |   3 -
 mplayer-mt/DESCR                             |  16 --
 mplayer-mt/Makefile                          |  49 ----
 mplayer-mt/Makefile.common                   |  49 ----
 mplayer-mt/Makefile.depends                  |  11 -
 mplayer-mt/PLIST                             |   2 -
 mplayer-mt/distinfo                          |   5 -
 mplayer-mt/options.mk                        | 304 ------------------------
 mplayer-mt/patches/patch-aa                  |  16 --
 mplayer-snapshot-share/DESCR                 |  14 --
 mplayer-snapshot-share/Makefile              |  28 ---
 mplayer-snapshot-share/Makefile.cflags       |  24 --
 mplayer-snapshot-share/Makefile.common       |  79 -------
 mplayer-snapshot-share/Makefile.depends      |   9 -
 mplayer-snapshot-share/PLIST                 | 169 --------------
 mplayer-snapshot-share/distinfo              |  13 --
 mplayer-snapshot-share/options.mk            | 331 ---------------------------
 mplayer-snapshot-share/patches/patch-aa      |  84 -------
 mplayer-snapshot-share/patches/patch-ac      |  13 --
 mplayer-snapshot-share/patches/patch-ae      |  16 --
 mplayer-snapshot-share/patches/patch-ag      |  16 --
 mplayer-snapshot-share/patches/patch-ah      |  66 ------
 mplayer-snapshot-share/patches/patch-an      |  38 ---
 mplayer-snapshot-share/patches/patch-ar      |  16 --
 mplayer-snapshot-share/patches/patch-vb      |  17 --
 mplayer-snapshot-share/patches/patch-ve_x264 |  18 --
 mplayer-snapshot/DESCR                       |  14 --
 mplayer-snapshot/Makefile                    |  45 ----
 mplayer-snapshot/PLIST                       |   2 -
 29 files changed, 1467 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 9e9c0b388d..9917c799a7 100644
--- a/Makefile
+++ b/Makefile
@@ -2466,9 +2466,6 @@ SUBDIR+=	mpg123-svn
 SUBDIR+=	mpgedit
 SUBDIR+=	mpibzip2
 SUBDIR+=	mplabs
-SUBDIR+=	mplayer-mt
-SUBDIR+=	mplayer-snapshot
-SUBDIR+=	mplayer-snapshot-share
 SUBDIR+=	mppdec
 SUBDIR+=	mppp
 SUBDIR+=	mpq-tools
diff --git a/mplayer-mt/DESCR b/mplayer-mt/DESCR
deleted file mode 100644
index a3bde76ce4..0000000000
--- a/mplayer-mt/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-MPlayer is a movie player for LINUX (runs on many other Unices, and non-x86
-CPUs). It plays most MPEG, VOB, AVI, VIVO, ASF/WMV, QT/MOV, FLI, RM,
-NuppelVideo, yuv4mpeg, FILM, RoQ files, supported by many native, XAnim, and
-Win32 DLL codecs. You can watch VideoCD, SVCD, DVD, 3ivx, and even DivX movies
-too. The another big feature of mplayer is the wide range of supported output
-drivers. It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, AAlib, DirectFB,
-but you can use GGI and SDL (and this way all their drivers) and some lowlevel
-card-specific drivers (for Matrox, 3Dfx, and Radeon) too! Most of them support
-software or hardware scaling, so you can enjoy movies in fullscreen. It also
-sports nice big antialiased shaded subtitles (10 supported types) with
-european/ISO 8859-1, 2 (hungarian, english, czech, etc), cyrillic, korean fonts,
-and OSD.
-
-This version uses experimental multithreaded FFmpeg-mt branch, which allows you
-to use multiple cores/CPU. To enable threading run `mplayer -lavdopts threads=N
-file.mkv' where N is the number of threads you want to use.
diff --git a/mplayer-mt/Makefile b/mplayer-mt/Makefile
deleted file mode 100644
index 4c210a0ab6..0000000000
--- a/mplayer-mt/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2012/10/03 15:09:58 asau Exp $
-
-PKGNAME=	mplayer-mt-20090720
-PKGREVISION=	1
-DISTNAME=	mplayer-svn-mt
-EXTRACT_SUFX=	.tar.bz2
-LICENSE=	gnu-gpl-v2
-
-COMMENT=	Software-only MPEG-1/2/4 video decoder
-
-WRKSRC=		${WRKDIR}/mplayer
-
-.include "Makefile.common"
-
-USE_TOOLS+=	pkg-config
-
-CONFIGURE_ARGS+=	--disable-mencoder
-CONFIGURE_ARGS+=	--confdir=${PREFIX}/share/mplayer
-CONFIGURE_ARGS+=	--extra-cflags="-I ${BUILDLINK_DIR}/include -I ${BUILDLINK_DIR}/include/faad2 -I ${BUILDLINK_DIR}/include/cdparanoia -I ${BUILDLINK_DIR}/include/freetype2"
-CONFIGURE_ARGS+=	--extra-libs="-L${BUILDLINK_DIR}/lib -lxvidcore"
-CONFIGURE_ARGS+=	--disable-rpath
-
-# Solaris/x86 has Xv, but the header files live in /usr/X11R6, not
-# ${X11_BASE}, so we need to also look for headers in this path.
-.if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "i386"
-CPPFLAGS+=		-I/usr/X11R6/include
-BUILDLINK_PASSTHRU_DIRS+=	/usr/X11R6/include
-.endif
-
-INSTALLATION_DIRS+=	bin
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mplayer ${DESTDIR}${PREFIX}/bin/mplayer-mt
-
-.include "../../x11/libXt/buildlink3.mk"
-
-.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libXv/buildlink3.mk"
-.if ${X11_TYPE} == "modular"
-.include "../../x11/libXvMC/buildlink3.mk"
-.endif
-.include "../../x11/libXxf86dga/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
-
-.include "../../graphics/MesaLib/buildlink3.mk"
-
-.include "Makefile.depends"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mplayer-mt/Makefile.common b/mplayer-mt/Makefile.common
deleted file mode 100644
index d15dddc610..0000000000
--- a/mplayer-mt/Makefile.common
+++ /dev/null
@@ -1,49 +0,0 @@
-# $NetBSD: Makefile.common,v 1.2 2009/07/21 13:25:04 koifren Exp $
-
-CATEGORIES?=		multimedia
-MASTER_SITES=		http://kefren.netbsd.ro/ \
-			http://just.mooo.com/
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER?=		pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE?=		http://www.mplayerhq.hu/
-
-#
-# NOTE: gmplayer has its own distinfo file. if you are also updating
-# gmplayer, you must ensure that *both* distinfo files contain the
-# correct, up-to-date files and checksums.
-#
-# NOTE: patches are shared between mplayer and gmplayer!
-#
-
-
-RESTRICTED=		Prohibited by USAs DMCA and patent law
-NO_BIN_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_FTP=		${RESTRICTED}
-
-USE_TOOLS+=		gmake
-HAS_CONFIGURE=		YES
-
-PTHREAD_OPTS+=		require
-
-CONFIGURE_ARGS+=	--prefix=${PREFIX} \
-#			--with-extraincdir="${LOCALBASE}/include:${LOCALBASE}/include/faad2:${LOCALBASE}/include/cdparanoia:${LOCALBASE}/include/freetype2" \
-			--with-extralibdir="${LOCALBASE}/lib" \
-			--disable-dvdread-internal --disable-smb
-
-ONLY_FOR_COMPILER=	gcc
-
-# The configure script attempts to test-execute compiled programs in /tmp,
-# but that directory may be mounted as noexec; work this around by setting
-# TMPDIR to ${WRKDIR}
-CONFIGURE_ENV+=		TMPDIR=${WRKDIR}
-
-.include "../../mk/bsd.prefs.mk"
-
-# The configure script misdetects endianness on mipseb
-.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "mipseb"
-CONFIGURE_ARGS+=	--enable-big-endian
-.endif
-
-.include "options.mk"
diff --git a/mplayer-mt/Makefile.depends b/mplayer-mt/Makefile.depends
deleted file mode 100644
index 3f90e58a05..0000000000
--- a/mplayer-mt/Makefile.depends
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile.depends,v 1.2 2009/07/21 13:25:04 koifren Exp $
-#
-
-#DEPENDS+=	mplayer-share>=${MPLAYER_PKG_VERSION}:../../multimedia/mplayer-share
-
-GCC_REQD+=	2.95.3
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
diff --git a/mplayer-mt/PLIST b/mplayer-mt/PLIST
deleted file mode 100644
index 6df6d310e3..0000000000
--- a/mplayer-mt/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2009/07/21 13:25:04 koifren Exp $
-bin/mplayer-mt
diff --git a/mplayer-mt/distinfo b/mplayer-mt/distinfo
deleted file mode 100644
index f8e85d7f6b..0000000000
--- a/mplayer-mt/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/07/21 12:15:26 koifren Exp $
-
-RMD160 (mplayer-svn-mt.tar.bz2) = dd153cea92f97ab9fc59d7d9bc6b21e12081ec17
-Size (mplayer-svn-mt.tar.bz2) = 12464556 bytes
-SHA1 (patch-aa) = 9d75a0bf4d6412812ab2ff3c5f170d8a256fb08c
diff --git a/mplayer-mt/options.mk b/mplayer-mt/options.mk
deleted file mode 100644
index 381458cb1e..0000000000
--- a/mplayer-mt/options.mk
+++ /dev/null
@@ -1,304 +0,0 @@
-# $NetBSD: options.mk,v 1.5 2014/05/31 15:57:20 thomasklausner Exp $
-
-.if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
-
-# Note: This expression is the same as ${PKGBASE}, but the latter is
-# not defined yet, so we cannot use it here.
-PKG_OPTIONS_VAR=	PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
-
-.include "../../mk/oss.buildlink3.mk"
-
-# -------------------------------------------------------------------------
-# Define PKG_SUPPORTED_OPTIONS based on the current package and system.
-# -------------------------------------------------------------------------
-
-# Options supported by both mplayer* or mencoder*.
-
-PKG_SUPPORTED_OPTIONS=	gif jpeg mad dts dv dvdread png theora vorbis x264 debug
-.  if ${OSS_TYPE} != "none"
-PKG_SUPPORTED_OPTIONS+=	oss
-.  endif
-
-PKG_OPTIONS_OPTIONAL_GROUPS=	faadgroup
-PKG_OPTIONS_GROUP.faadgroup=	faad mplayer-internal-faad
-PKG_SUGGESTED_OPTIONS+=		mplayer-internal-faad
-
-# Set options based on the specific package being built.
-.  if !empty(PKGNAME:M*mplayer*)
-PKG_SUPPORTED_OPTIONS+=	aalib esound ggi mplayer-menu nas pulseaudio sdl
-
-.  elif !empty(PKGNAME:M*mencoder*)
-PKG_SUPPORTED_OPTIONS+=	faac lame
-.  endif
-
-# OS-specific options.
-.  if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
-PKG_SUPPORTED_OPTIONS+=	cdparanoia
-.  elif ${OPSYS} == "SunOS"
-PKG_SUPPORTED_OPTIONS+=	mlib
-.  endif
-.  if ${OPSYS} == "Linux"
-PKG_SUPPORTED_OPTIONS+=	vidix
-.  endif
-
-.  if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/videoio.h)
-PKG_SUPPORTED_OPTIONS+=		v4l2
-#PKG_SUGGESTED_OPTIONS+=	v4l2
-.  endif
-
-# Platform-specific options.
-.  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
-    ${MACHINE_ARCH} == "powerpc"
-PKG_SUPPORTED_OPTIONS+=	mplayer-runtime-cpudetection
-.  endif
-.  if ${MACHINE_ARCH} == "i386"
-PKG_SUPPORTED_OPTIONS+=	mplayer-default-cflags mplayer-win32
-.  endif
-.  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-PKG_SUPPORTED_OPTIONS+=	mplayer-ssse3
-.  endif
-.  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
-    ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64"
-PKG_SUPPORTED_OPTIONS+=	xvid
-.  endif
-
-# -------------------------------------------------------------------------
-# Define PKG_SUGGESTED_OPTIONS.
-# -------------------------------------------------------------------------
-
-.  for _o_ in aalib cdparanoia dv dvdread esound gif jpeg \
-	    lame mad mplayer-menu \
-	    mplayer-default-cflags mplayer-runtime-cpudetection mplayer-win32 \
-	    nas oss pulseaudio png sdl theora vorbis x264 xvid
-.    if !empty(PKG_SUPPORTED_OPTIONS:M${_o_})
-PKG_SUGGESTED_OPTIONS+=	${_o_}
-.    endif
-.  endfor
-.  if ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+=	vidix
-.  endif
-
-# -------------------------------------------------------------------------
-# Handle extra libraries (part 1)
-# -------------------------------------------------------------------------
-EXTRA_LIBS=
-
-# -------------------------------------------------------------------------
-# Handle chosen options.
-# -------------------------------------------------------------------------
-
-.include "../../mk/bsd.options.mk"
-
-.  if !empty(PKG_OPTIONS:Maalib)
-.    include "../../graphics/aalib/buildlink3.mk"
-.  endif
-
-CONFIGURE_ARGS+=	--disable-arts
-
-.  if !empty(PKG_OPTIONS:Mcdparanoia)
-CONFIGURE_ARGS+=	--enable-cdparanoia
-.    include "../../audio/cdparanoia/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-cdparanoia
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+=	--enable-debug
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mdts)
-CONFIGURE_ARGS+=	--enable-libdca
-.    include "../../audio/libdca/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-libdca
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mdv)
-CONFIGURE_ARGS+=	--enable-libdv
-.    include "../../multimedia/libdv/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-libdv
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mdvdread)
-CONFIGURE_ARGS+=	--enable-dvdread
-.    include "../../multimedia/libdvdread/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-dvdread
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mesound)
-CONFIGURE_ARGS+=	--enable-esd
-.    include "../../audio/esound/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-esd
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mfaac)
-.    include "../../audio/faac/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-faac
-.  endif
-
-.  if empty(PKG_OPTIONS:Mfaad) && empty(PKG_OPTIONS:Mmplayer-internal-faad)
-CONFIGURE_ARGS+=	--disable-faad-external
-CONFIGURE_ARGS+=	--disable-faad-internal
-.  elif !empty(PKG_OPTIONS:Mfaad)
-CONFIGURE_ARGS+=	--enable-faad-external
-.    include "../../audio/faad2/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--enable-faad-internal
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mggi)
-CONFIGURE_ARGS+=	--enable-ggi
-.    include "../../graphics/libggi/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-ggi
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mgif)
-CONFIGURE_ARGS+=	--enable-gif
-.    include "../../graphics/giflib/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-gif
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mjpeg)
-CONFIGURE_ARGS+=	--enable-jpeg
-.    include "../../mk/jpeg.buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-jpeg
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mlame)
-#CONFIGURE_ARGS+=	--enable-toolame
-.    include "../../audio/lame/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-toolame
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mmad)
-CONFIGURE_ARGS+=	--enable-mad
-.    include "../../audio/libmad/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-mad
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mmlib)
-CONFIGURE_ARGS+=	--enable-mlib
-.  else
-CONFIGURE_ARGS+=	--disable-mlib
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mmplayer-menu)
-CONFIGURE_ARGS+=	--enable-menu
-.  else
-CONFIGURE_ARGS+=	--disable-menu
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mmplayer-runtime-cpudetection)
-CONFIGURE_ARGS+=	--enable-runtime-cpudetection
-.  else
-CONFIGURE_ARGS+=	--disable-runtime-cpudetection
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mmplayer-win32)
-EVAL_PREFIX+=			PREFIX.win32-codecs=win32-codecs
-PREFIX.win32-codecs_DEFAULT=	${PREFIX}
-CONFIGURE_ARGS+=		--enable-win32dll
-CONFIGURE_ARGS+=		--win32codecsdir="${PREFIX.win32-codecs}/lib/win32"
-DEPENDS+=			win32-codecs>=011227:../../multimedia/win32-codecs
-.  else
-CONFIGURE_ARGS+=		--disable-win32dll
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mnas)
-CONFIGURE_ARGS+=	--enable-nas
-.    include "../../audio/nas/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-nas
-.  endif
-
-.  if ${OSS_TYPE} != "none" && !empty(PKG_OPTIONS:Moss)
-CONFIGURE_ARGS+=	--enable-ossaudio
-.  else
-CONFIGURE_ARGS+=	--disable-ossaudio
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mpng)
-CONFIGURE_ARGS+=	--enable-png
-.    include "../../graphics/png/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-png
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mpulseaudio)
-CONFIGURE_ARGS+=	--enable-pulse
-.    include "../../devel/glib2/buildlink3.mk"
-.    include "../../audio/pulseaudio/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-pulse
-.  endif
-
-.  if !empty(PKG_OPTIONS:Msdl)
-CONFIGURE_ARGS+=	--enable-sdl
-.    include "../../devel/SDL/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-sdl
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mtheora)
-CONFIGURE_ARGS+=	--enable-theora
-.    include "../../multimedia/libtheora/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-theora
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mv4l2)
-CONFIGURE_ARGS+=	--enable-tv-v4l2
-.  else
-CONFIGURE_ARGS+=	--disable-tv-v4l2
-.  endif
-
-# disable vidix if not in options
-.  if empty(PKG_OPTIONS:Mvidix)
-CONFIGURE_ARGS+=	--disable-vidix
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mvorbis)
-CONFIGURE_ARGS+=	--enable-libvorbis
-.  else
-CONFIGURE_ARGS+=	--disable-libvorbis
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mx264)
-.    include "../../multimedia/x264-devel/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-x264
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mxvid)
-CONFIGURE_ARGS+=	--enable-xvid
-EXTRA_LIBS+=		-lxvidcore
-.    include "../../multimedia/xvidcore/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-xvid
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mmplayer-ssse3)
-# needs a recent assembler
-.include "../../devel/binutils/buildlink3.mk"
-.include "../../devel/binutils/override-as.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-ssse3
-.  endif
-
-# -------------------------------------------------------------------------
-# Handle extra libraries (part 1)
-# -------------------------------------------------------------------------
-.  if ${EXTRA_LIBS} != ""
-CONFIGURE_ARGS+=	--extra-libs=${EXTRA_LIBS:C/^ //:Q}
-.  endif
-
-.endif # defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
diff --git a/mplayer-mt/patches/patch-aa b/mplayer-mt/patches/patch-aa
deleted file mode 100644
index 2515b6d2e0..0000000000
--- a/mplayer-mt/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2009/07/21 13:25:04 koifren Exp $
---- configure.orig	2009-07-21 15:06:02.000000000 +0300
-+++ configure	2009-07-21 15:06:14.000000000 +0300
-@@ -4141,11 +4141,7 @@
-   for I in "" -L/usr/X11R7/lib -L/usr/X11R6/lib -L/usr/lib/X11R6 \
-            -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/X11R6/lib64 \
-            -L/usr/lib ; do
--    if netbsd; then
--      _ld_tmp="$I -lXext -lX11 $_ld_pthread -Wl,-R$(echo $I | sed s/^-L//)"
--    else
--      _ld_tmp="$I -lXext -lX11 $_ld_pthread"
--    fi
-+    _ld_tmp="$I -lXext -lX11 $_ld_pthread"
-     cc_check $_ld_tmp && libs_mplayer="$libs_mplayer $_ld_tmp" \
-                       && _x11=yes && break
-   done
diff --git a/mplayer-snapshot-share/DESCR b/mplayer-snapshot-share/DESCR
deleted file mode 100644
index 3a81d317e2..0000000000
--- a/mplayer-snapshot-share/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-MPlayer is a movie player for LINUX (runs on many other Unices,
-and non-x86 CPUs). It plays most MPEG, VOB, AVI, VIVO, ASF/WMV,
-QT/MOV, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ files, supported
-by many native, XAnim, and Win32 DLL codecs. You can watch VideoCD,
-SVCD, DVD, 3ivx, and even DivX movies too. The another big feature
-of mplayer is the wide range of supported output drivers. It works
-with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, AAlib, DirectFB, but
-you can use GGI and SDL (and this way all their drivers) and some
-lowlevel card-specific drivers (for Matrox, 3Dfx, and Radeon) too!
-Most of them support software or hardware scaling, so you can
-enjoy movies in fullscreen. It also sports nice big antialiased
-shaded subtitles (10 supported types) with european/ISO 8859-1,
-2 (hungarian, english, czech, etc), cyrillic, korean fonts, and
-OSD.
diff --git a/mplayer-snapshot-share/Makefile b/mplayer-snapshot-share/Makefile
deleted file mode 100644
index 2083654eac..0000000000
--- a/mplayer-snapshot-share/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2012/10/03 15:09:58 asau Exp $
-
-.include "Makefile.common"
-
-PKGNAME=	mplayer-share-${MPLAYER_VERSION}
-COMMENT=	Documentation used by mplayer and gmplayer
-
-DEPENDS+=	mplayer-fonts-[0-9]*:../../fonts/mplayer-fonts
-
-USE_TOOLS+=	pax
-
-NO_BUILD=	YES
-NO_CONFIGURE=	YES
-
-INSTALLATION_DIRS=	${PKGMANDIR}/man1 share/mplayer/DOCS
-
-do-install:
-	${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA} ${WRKSRC}/etc/codecs.conf ${DESTDIR}${PREFIX}/share/mplayer
-	${INSTALL_DATA} ${WRKSRC}/etc/input.conf ${DESTDIR}${PREFIX}/share/mplayer
-	(cd ${WRKSRC}/DOCS && \
-		pax -rwpppm * ${DESTDIR}${PREFIX}/share/mplayer/DOCS); \
-	${FIND} ${DESTDIR}${PREFIX}/share/mplayer/DOCS -type d -print | \
-		${XARGS} ${CHMOD} ${PKGDIRMODE}
-	${FIND} ${DESTDIR}${PREFIX}/share/mplayer/DOCS -type f -print | \
-		${XARGS} ${CHMOD} ${SHAREMODE}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mplayer-snapshot-share/Makefile.cflags b/mplayer-snapshot-share/Makefile.cflags
deleted file mode 100644
index d9918dfebe..0000000000
--- a/mplayer-snapshot-share/Makefile.cflags
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile.cflags,v 1.1.1.1 2010/09/07 21:52:27 cheusov Exp $
-
-# This must be included after everything else to truly clear ${CFLAGS}
-# in the non-runtime-cpu-detection case. If ${CFLAGS} is non-empty, the
-# configure script refuses to add any optimizations at all.
-
-.if !empty(PKG_OPTIONS:Mmplayer-default-cflags)
-.  if ${MACHINE_ARCH} == "i386" && !empty(PKGSRC_COMPILER:Mgcc)
-# Schedule for the typical machine fast enough to run mplayer. This
-# is nearly optimal for K6-2 as well. Anything slower will still run
-# (but would probably benefit greatly from turning off the run-time
-# cpu detection).
-
-.    include "../../mk/compiler.mk"
-
-.    if !empty(CC_VERSION:Mgcc-4*)
-CFLAGS+=	-O3 -ffast-math -fomit-frame-pointer -mtune=pentiumpro
-.    else
-CFLAGS+=	-O3 -ffast-math -fomit-frame-pointer -mcpu=pentiumpro
-.    endif
-.  else
-CFLAGS+=	-O3 -ffast-math -fomit-frame-pointer
-.  endif
-.endif
diff --git a/mplayer-snapshot-share/Makefile.common b/mplayer-snapshot-share/Makefile.common
deleted file mode 100644
index 96e0576617..0000000000
--- a/mplayer-snapshot-share/Makefile.common
+++ /dev/null
@@ -1,79 +0,0 @@
-# $NetBSD: Makefile.common,v 1.4 2010/09/14 13:03:30 cheusov Exp $
-# used by multimedia/gmplayer/Makefile
-# used by wip/mplayer-snapshot/Makefile
-# used by multimedia/mencoder/Makefile
-# used by multimedia/mplayer/Makefile
-
-MPLAYER_SNAPSHOT_DATE=	2010-09-13
-MPLAYER_VERSION=	1.0rc${MPLAYER_SNAPSHOT_DATE:S/-//g}
-
-DISTNAME=		mplayer-${MPLAYER_SNAPSHOT_DATE:S/-//g}
-
-CATEGORIES?=		multimedia
-
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=commondistfiles/}
-
-EXTRACT_SUFX=		.tar.bz2
-DIST_SUBDIR=		mplayer
-
-WRKSRC=			${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
-
-MAINTAINER?=		ahoka%NetBSD.org@localhost
-HOMEPAGE?=		http://www.mplayerhq.hu/
-
-#
-# NOTE: gmplayer has its own distinfo file. if you are also updating
-# gmplayer, you must ensure that *both* distinfo files contain the
-# correct, up-to-date files and checksums.
-#
-# NOTE: patches are shared between mplayer and gmplayer!
-#
-
-PATCHDIR=		${.CURDIR}/../../wip/mplayer-snapshot-share/patches
-DISTINFO_FILE=		${.CURDIR}/../../wip/mplayer-snapshot-share/distinfo
-
-RESTRICTED=		Prohibited by USAs DMCA and patent law
-NO_BIN_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_FTP=		${RESTRICTED}
-
-USE_TOOLS+=		gmake
-HAS_CONFIGURE=		YES
-
-PTHREAD_OPTS+=		require
-
-CONFIGURE_ARGS+=	--prefix=${PREFIX} \
-			#--with-extraincdir="${LOCALBASE}/include:${LOCALBASE}/include/faad2:${LOCALBASE}/include/cdparanoia:${LOCALBASE}/include/freetype2" \
-			--with-extralibdir="${LOCALBASE}/lib" \
-			--disable-dvdread-internal --disable-smb
-
-ONLY_FOR_COMPILER=	gcc
-
-# The configure script attempts to test-execute compiled programs in /tmp,
-# but that directory may be mounted as noexec; work this around by setting
-# TMPDIR to ${WRKDIR}
-CONFIGURE_ENV+=		TMPDIR=${WRKDIR}
-
-.include "../../mk/bsd.prefs.mk"
-
-# The configure script misdetects endianness on mipseb
-.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "mipseb"
-CONFIGURE_ARGS+=	--enable-big-endian
-.endif
-
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-arm)
-# Avoid crash with system include file:
-pre-patch:
-	mv ${WRKSRC}/libavutil/arm/bswap.h ${WRKSRC}/libavutil/arm/avbswap.h
-
-SUBST_CLASSES+=			arm_bswap
-SUBST_STAGE.arm_bswap=		pre-configure
-SUBST_FILES.arm_bswap=		libavutil/bswap.h
-SUBST_SED.arm_bswap=		-e s,\"arm/bswap.h\",\"arm/avbswap.h\",g
-SUBST_MESSAGE.arm_bswap=	Fixing "arm/bswap.h" conflict in libavutil
-
-# autodetect code enables these options on NetBSD/arm but it should not
-CONFIGURE_ARGS+=	--disable-armv5te --disable-armv6 --disable-armv6t2
-.endif
-
-.include "../../wip/mplayer-snapshot-share/options.mk"
diff --git a/mplayer-snapshot-share/Makefile.depends b/mplayer-snapshot-share/Makefile.depends
deleted file mode 100644
index 3c258d0a62..0000000000
--- a/mplayer-snapshot-share/Makefile.depends
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: Makefile.depends,v 1.5 2010/09/14 13:03:31 cheusov Exp $
-#
-
-DEPENDS+=	mplayer-share>=${MPLAYER_VERSION}:../../wip/mplayer-snapshot-share
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
diff --git a/mplayer-snapshot-share/PLIST b/mplayer-snapshot-share/PLIST
deleted file mode 100644
index d50d8dea03..0000000000
--- a/mplayer-snapshot-share/PLIST
+++ /dev/null
@@ -1,169 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2010/09/11 13:29:39 cheusov Exp $
-man/man1/mplayer.1
-share/mplayer/DOCS/README
-share/mplayer/DOCS/default.css
-share/mplayer/DOCS/man/cs/mplayer.1
-share/mplayer/DOCS/man/de/mplayer.1
-share/mplayer/DOCS/man/en/mplayer.1
-share/mplayer/DOCS/man/es/mplayer.1
-share/mplayer/DOCS/man/fr/mplayer.1
-share/mplayer/DOCS/man/hu/mplayer.1
-share/mplayer/DOCS/man/it/mplayer.1
-share/mplayer/DOCS/man/pl/mplayer.1
-share/mplayer/DOCS/man/ru/mplayer.1
-share/mplayer/DOCS/man/zh_CN/mplayer.1
-share/mplayer/DOCS/tech/Doxyfile
-share/mplayer/DOCS/tech/MAINTAINERS
-share/mplayer/DOCS/tech/TODO
-share/mplayer/DOCS/tech/binary-packaging.txt
-share/mplayer/DOCS/tech/code-documentation.txt
-share/mplayer/DOCS/tech/codec-devel.txt
-share/mplayer/DOCS/tech/codecs-in.html
-share/mplayer/DOCS/tech/codecs.conf.txt
-share/mplayer/DOCS/tech/colorspaces.txt
-share/mplayer/DOCS/tech/dr-methods.txt
-share/mplayer/DOCS/tech/dvdnav-howto.txt
-share/mplayer/DOCS/tech/encoding-guide.txt
-share/mplayer/DOCS/tech/encoding-tips.txt
-share/mplayer/DOCS/tech/formats.txt
-share/mplayer/DOCS/tech/general.txt
-share/mplayer/DOCS/tech/hwac3.txt
-share/mplayer/DOCS/tech/libao2.txt
-share/mplayer/DOCS/tech/libmpcodecs.txt
-share/mplayer/DOCS/tech/libvo.txt
-share/mplayer/DOCS/tech/manpage.txt
-share/mplayer/DOCS/tech/mingw-crosscompile.txt
-share/mplayer/DOCS/tech/mirrors/mirror_howto.txt
-share/mplayer/DOCS/tech/mirrors/update_mplayer_rsync
-share/mplayer/DOCS/tech/mpdsf.txt
-share/mplayer/DOCS/tech/mpsub.sub
-share/mplayer/DOCS/tech/osd.txt
-share/mplayer/DOCS/tech/patches.txt
-share/mplayer/DOCS/tech/playtree
-share/mplayer/DOCS/tech/realcodecs/TODO
-share/mplayer/DOCS/tech/realcodecs/audio-codecs.txt
-share/mplayer/DOCS/tech/realcodecs/streaming.txt
-share/mplayer/DOCS/tech/realcodecs/video-codecs.txt
-share/mplayer/DOCS/tech/release-howto.txt
-share/mplayer/DOCS/tech/slave.txt
-share/mplayer/DOCS/tech/snow.txt
-share/mplayer/DOCS/tech/subcp.txt
-share/mplayer/DOCS/tech/svn-howto.txt
-share/mplayer/DOCS/tech/swscaler_filters.txt
-share/mplayer/DOCS/tech/swscaler_methods.txt
-share/mplayer/DOCS/tech/translations.txt
-share/mplayer/DOCS/tech/vidix.txt
-share/mplayer/DOCS/tech/win32-codec-howto.txt
-share/mplayer/DOCS/tech/wishlist
-share/mplayer/DOCS/xml/Makefile
-share/mplayer/DOCS/xml/README
-share/mplayer/DOCS/xml/configure
-share/mplayer/DOCS/xml/cs/bugreports.xml
-share/mplayer/DOCS/xml/cs/documentation.xml
-share/mplayer/DOCS/xml/cs/encoding-guide.xml
-share/mplayer/DOCS/xml/cs/faq.xml
-share/mplayer/DOCS/xml/cs/install.xml
-share/mplayer/DOCS/xml/cs/mencoder.xml
-share/mplayer/DOCS/xml/cs/ports.xml
-share/mplayer/DOCS/xml/cs/skin.xml
-share/mplayer/DOCS/xml/cs/usage.xml
-share/mplayer/DOCS/xml/cs/video.xml
-share/mplayer/DOCS/xml/de/bugreports.xml
-share/mplayer/DOCS/xml/de/documentation.xml
-share/mplayer/DOCS/xml/de/encoding-guide.xml
-share/mplayer/DOCS/xml/de/faq.xml
-share/mplayer/DOCS/xml/de/install.xml
-share/mplayer/DOCS/xml/de/mencoder.xml
-share/mplayer/DOCS/xml/de/ports.xml
-share/mplayer/DOCS/xml/de/skin.xml
-share/mplayer/DOCS/xml/de/usage.xml
-share/mplayer/DOCS/xml/de/video.xml
-share/mplayer/DOCS/xml/default.css
-share/mplayer/DOCS/xml/en/bugreports.xml
-share/mplayer/DOCS/xml/en/documentation.xml
-share/mplayer/DOCS/xml/en/encoding-guide.xml
-share/mplayer/DOCS/xml/en/faq.xml
-share/mplayer/DOCS/xml/en/install.xml
-share/mplayer/DOCS/xml/en/mencoder.xml
-share/mplayer/DOCS/xml/en/ports.xml
-share/mplayer/DOCS/xml/en/skin.xml
-share/mplayer/DOCS/xml/en/usage.xml
-share/mplayer/DOCS/xml/en/video.xml
-share/mplayer/DOCS/xml/es/bugreports.xml
-share/mplayer/DOCS/xml/es/documentation.xml
-share/mplayer/DOCS/xml/es/encoding-guide.xml
-share/mplayer/DOCS/xml/es/faq.xml
-share/mplayer/DOCS/xml/es/install.xml
-share/mplayer/DOCS/xml/es/mencoder.xml
-share/mplayer/DOCS/xml/es/ports.xml
-share/mplayer/DOCS/xml/es/skin.xml
-share/mplayer/DOCS/xml/es/usage.xml
-share/mplayer/DOCS/xml/es/video.xml
-share/mplayer/DOCS/xml/fr/bugreports.xml
-share/mplayer/DOCS/xml/fr/documentation.xml
-share/mplayer/DOCS/xml/fr/encoding-guide.xml
-share/mplayer/DOCS/xml/fr/faq.xml
-share/mplayer/DOCS/xml/fr/install.xml
-share/mplayer/DOCS/xml/fr/mencoder.xml
-share/mplayer/DOCS/xml/fr/ports.xml
-share/mplayer/DOCS/xml/fr/skin.xml
-share/mplayer/DOCS/xml/fr/usage.xml
-share/mplayer/DOCS/xml/fr/video.xml
-share/mplayer/DOCS/xml/html-common.xsl
-share/mplayer/DOCS/xml/hu/bugreports.xml
-share/mplayer/DOCS/xml/hu/documentation.xml
-share/mplayer/DOCS/xml/hu/encoding-guide.xml
-share/mplayer/DOCS/xml/hu/faq.xml
-share/mplayer/DOCS/xml/hu/install.xml
-share/mplayer/DOCS/xml/hu/mencoder.xml
-share/mplayer/DOCS/xml/hu/ports.xml
-share/mplayer/DOCS/xml/hu/skin.xml
-share/mplayer/DOCS/xml/hu/usage.xml
-share/mplayer/DOCS/xml/hu/video.xml
-share/mplayer/DOCS/xml/it/bugreports.xml
-share/mplayer/DOCS/xml/it/documentation.xml
-share/mplayer/DOCS/xml/it/encoding-guide.xml
-share/mplayer/DOCS/xml/it/faq.xml
-share/mplayer/DOCS/xml/it/install.xml
-share/mplayer/DOCS/xml/it/mencoder.xml
-share/mplayer/DOCS/xml/it/ports.xml
-share/mplayer/DOCS/xml/it/skin.xml
-share/mplayer/DOCS/xml/it/usage.xml
-share/mplayer/DOCS/xml/it/video.xml
-share/mplayer/DOCS/xml/ldp.dsl
-share/mplayer/DOCS/xml/pl/bugreports.xml
-share/mplayer/DOCS/xml/pl/documentation.xml
-share/mplayer/DOCS/xml/pl/encoding-guide.xml
-share/mplayer/DOCS/xml/pl/faq.xml
-share/mplayer/DOCS/xml/pl/install.xml
-share/mplayer/DOCS/xml/pl/mencoder.xml
-share/mplayer/DOCS/xml/pl/ports.xml
-share/mplayer/DOCS/xml/pl/skin.xml
-share/mplayer/DOCS/xml/pl/usage.xml
-share/mplayer/DOCS/xml/pl/video.xml
-share/mplayer/DOCS/xml/ru/bugreports.xml
-share/mplayer/DOCS/xml/ru/documentation.xml
-share/mplayer/DOCS/xml/ru/encoding-guide.xml
-share/mplayer/DOCS/xml/ru/faq.xml
-share/mplayer/DOCS/xml/ru/install.xml
-share/mplayer/DOCS/xml/ru/mencoder.xml
-share/mplayer/DOCS/xml/ru/ports.xml
-share/mplayer/DOCS/xml/ru/skin.xml
-share/mplayer/DOCS/xml/ru/usage.xml
-share/mplayer/DOCS/xml/ru/video.xml
-share/mplayer/DOCS/xml/xsl/ldp-html-chunk.xsl
-share/mplayer/DOCS/xml/xsl/ldp-html-common.xsl
-share/mplayer/DOCS/xml/xsl/ldp-html.xsl
-share/mplayer/DOCS/xml/xsl/ldp-print.xsl
-share/mplayer/DOCS/xml/zh_CN/bugreports.xml
-share/mplayer/DOCS/xml/zh_CN/documentation.xml
-share/mplayer/DOCS/xml/zh_CN/encoding-guide.xml
-share/mplayer/DOCS/xml/zh_CN/faq.xml
-share/mplayer/DOCS/xml/zh_CN/install.xml
-share/mplayer/DOCS/xml/zh_CN/mencoder.xml
-share/mplayer/DOCS/xml/zh_CN/ports.xml
-share/mplayer/DOCS/xml/zh_CN/skin.xml
-share/mplayer/DOCS/xml/zh_CN/usage.xml
-share/mplayer/DOCS/xml/zh_CN/video.xml
-share/mplayer/codecs.conf
-share/mplayer/input.conf
diff --git a/mplayer-snapshot-share/distinfo b/mplayer-snapshot-share/distinfo
deleted file mode 100644
index 5b1700e240..0000000000
--- a/mplayer-snapshot-share/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.7 2010/09/14 13:03:31 cheusov Exp $
-
-RMD160 (mplayer/mplayer-20100913.tar.bz2) = 79085d4ebdb824fc34f7bc128070ef11e874897d
-Size (mplayer/mplayer-20100913.tar.bz2) = 9073690 bytes
-SHA1 (patch-aa) = 8ee4f3d12500bcff8d06b1a3300bb821e4ffd8ba
-SHA1 (patch-ac) = 3d037c96537233cdbda582afdb878dcf3f43e923
-SHA1 (patch-ae) = 7e1f05cd6e09f8755debfff7061dadf0a8ca3a3f
-SHA1 (patch-ag) = bef25568c913dcb8535afa51976ce7c94a6af5a2
-SHA1 (patch-ah) = 8cbd14c61e74023055770baf27201687aa34fede
-SHA1 (patch-an) = 3e72fb86abe7ab572f12a4fef002edb623ab6fae
-SHA1 (patch-ar) = df7e7cdc6fb8187bbcf0b285afc14d275a51e17a
-SHA1 (patch-vb) = ce584c31e0e32865e87aa1f537a1f9e4817c7442
-SHA1 (patch-ve_x264) = 1946a2b2a7643bbc1d3f6a8963e21c4f6cbd2c89
diff --git a/mplayer-snapshot-share/options.mk b/mplayer-snapshot-share/options.mk
deleted file mode 100644
index bd646b698e..0000000000
--- a/mplayer-snapshot-share/options.mk
+++ /dev/null
@@ -1,331 +0,0 @@
-# $NetBSD: options.mk,v 1.10 2014/05/31 15:57:20 thomasklausner Exp $
-
-.if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
-
-# Note: This expression is the same as ${PKGBASE}, but the latter is
-# not defined yet, so we cannot use it here.
-PKG_OPTIONS_VAR=	PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
-
-.include "../../mk/oss.buildlink3.mk"
-.include "../../multimedia/libvdpau/available.mk"
-
-# -------------------------------------------------------------------------
-# Define PKG_SUPPORTED_OPTIONS based on the current package and system.
-# -------------------------------------------------------------------------
-
-# Options supported by both mplayer* or mencoder*.
-
-PKG_SUPPORTED_OPTIONS=	gif jpeg mad dts dv png theora vorbis x264 debug
-PKG_SUPPORTED_OPTIONS+=	dvdread dvdnav
-.  if ${OSS_TYPE} != "none"
-PKG_SUPPORTED_OPTIONS+=	oss
-.  endif
-
-PKG_OPTIONS_OPTIONAL_GROUPS=	faadgroup
-PKG_OPTIONS_GROUP.faadgroup=	faad mplayer-internal-faad
-PKG_SUGGESTED_OPTIONS+=		mplayer-internal-faad
-
-# Set options based on the specific package being built.
-.  if !empty(PKGNAME:M*mplayer*)
-PKG_SUPPORTED_OPTIONS+=	aalib esound ggi mplayer-menu nas pulseaudio sdl
-
-.    if ${VDPAU_AVAILABLE} == "yes"
-PKG_SUPPORTED_OPTIONS+=	vdpau
-.    endif
-
-.  elif !empty(PKGNAME:M*mencoder*)
-PKG_SUPPORTED_OPTIONS+=	faac lame
-.  endif
-
-# OS-specific options.
-.  if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
-PKG_SUPPORTED_OPTIONS+=	cdparanoia
-.  elif ${OPSYS} == "SunOS"
-PKG_SUPPORTED_OPTIONS+=	mlib
-.  endif
-.  if ${OPSYS} == "Linux"
-PKG_SUPPORTED_OPTIONS+=	vidix
-.  endif
-
-.  if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/videoio.h)
-PKG_SUPPORTED_OPTIONS+=	v4l2
-PKG_SUGGESTED_OPTIONS+=	v4l2
-.  endif
-
-# Platform-specific options.
-.  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
-    ${MACHINE_ARCH} == "powerpc"
-PKG_SUPPORTED_OPTIONS+=	mplayer-runtime-cpudetection
-.  endif
-.  if ${MACHINE_ARCH} == "i386"
-PKG_SUPPORTED_OPTIONS+=	mplayer-default-cflags mplayer-win32
-.  endif
-.  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-PKG_SUPPORTED_OPTIONS+=	mplayer-ssse3
-.  endif
-.  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
-    ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64"
-PKG_SUPPORTED_OPTIONS+=	xvid
-.  endif
-
-# -------------------------------------------------------------------------
-# Define PKG_SUGGESTED_OPTIONS.
-# -------------------------------------------------------------------------
-
-.  for _o_ in cdparanoia dv esound gif jpeg \
-	    dvdread dvdnav \
-	    lame mad mplayer-menu \
-	    mplayer-default-cflags mplayer-runtime-cpudetection mplayer-win32 \
-	    nas oss pulseaudio png sdl theora vorbis x264 xvid vdpau
-.    if !empty(PKG_SUPPORTED_OPTIONS:M${_o_})
-PKG_SUGGESTED_OPTIONS+=	${_o_}
-.    endif
-.  endfor
-.  if ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+=	vidix
-.  endif
-
-# -------------------------------------------------------------------------
-# Handle extra libraries (part 1)
-# -------------------------------------------------------------------------
-EXTRA_LIBS=
-
-# -------------------------------------------------------------------------
-# Handle chosen options.
-# -------------------------------------------------------------------------
-
-.include "../../mk/bsd.options.mk"
-
-.  if !empty(PKG_OPTIONS:Maalib)
-.    include "../../graphics/aalib/buildlink3.mk"
-.  endif
-
-CONFIGURE_ARGS+=	--disable-arts
-
-.  if !empty(PKG_OPTIONS:Mcdparanoia)
-CONFIGURE_ARGS+=	--enable-cdparanoia
-.    include "../../audio/cdparanoia/buildlink3.mk"
-CFLAGS+=		-I${BUILDLINK_PREFIX.cdparanoia}/include/cdparanoia
-.  else
-CONFIGURE_ARGS+=	--disable-cdparanoia
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+=	--enable-debug
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mdts)
-# The configure handling for --enable-libdca is broken.
-# However, it works if you omit the argument and let
-# configure autodetect support.
-#CONFIGURE_ARGS+=       --enable-libdca
-.    include "../../audio/libdca/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-libdca
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mdv)
-CONFIGURE_ARGS+=	--enable-libdv
-.    include "../../multimedia/libdv/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-libdv
-.  endif
-
-CONFIGURE_ARGS+=	--disable-dvdread-internal
-.  if !empty(PKG_OPTIONS:Mdvdread)
-CONFIGURE_ARGS+=	--enable-dvdread
-CONFIGURE_ARGS+=	--with-dvdread-config=${BUILDLINK_PREFIX.libdvdread}/bin/dvdread-config
-.    include "../../multimedia/libdvdread/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-dvdread
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mdvdnav)
-CONFIGURE_ARGS+=	--enable-dvdnav
-CONFIGURE_ARGS+=	--with-dvdnav-config=${BUILDLINK_PREFIX.libdvdnav}/bin/dvdnav-config
-.    include "../../multimedia/libdvdnav/buildlink3.mk"
-#CFLAGS+=		-I${BUILDLINK_PREFIX.libdvdnav}/include/dvdnav
-.  else
-CONFIGURE_ARGS+=	--disable-dvdnav
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mesound)
-CONFIGURE_ARGS+=	--enable-esd
-.    include "../../audio/esound/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-esd
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mfaac)
-.    include "../../audio/faac/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-faac
-.  endif
-
-.  if empty(PKG_OPTIONS:Mfaad) && empty(PKG_OPTIONS:Mmplayer-internal-faad)
-CONFIGURE_ARGS+=	--disable-faad-internal
-.  elif !empty(PKG_OPTIONS:Mfaad)
-CONFIGURE_ARGS+=	--enable-faad
-.    include "../../audio/faad2/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--enable-faad-internal
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mggi)
-CONFIGURE_ARGS+=	--enable-ggi
-.    include "../../graphics/libggi/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-ggi
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mgif)
-CONFIGURE_ARGS+=	--enable-gif
-.    include "../../graphics/giflib/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-gif
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mjpeg)
-CONFIGURE_ARGS+=	--enable-jpeg
-.    include "../../mk/jpeg.buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-jpeg
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mlame)
-#CONFIGURE_ARGS+=	--enable-toolame
-.    include "../../audio/lame/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-toolame
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mmad)
-CONFIGURE_ARGS+=	--enable-mad
-.    include "../../audio/libmad/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-mad
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mmlib)
-CONFIGURE_ARGS+=	--enable-mlib
-.  else
-CONFIGURE_ARGS+=	--disable-mlib
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mmplayer-menu)
-CONFIGURE_ARGS+=	--enable-menu
-.  else
-CONFIGURE_ARGS+=	--disable-menu
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mmplayer-runtime-cpudetection)
-CONFIGURE_ARGS+=	--enable-runtime-cpudetection
-.  else
-CONFIGURE_ARGS+=	--disable-runtime-cpudetection
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mmplayer-win32)
-EVAL_PREFIX+=			PREFIX.win32-codecs=win32-codecs
-PREFIX.win32-codecs_DEFAULT=	${PREFIX}
-CONFIGURE_ARGS+=		--enable-win32dll
-#CONFIGURE_ARGS+=		--win32codecsdir="${PREFIX.win32-codecs}/lib/win32"
-DEPENDS+=			win32-codecs>=011227:../../multimedia/win32-codecs
-.  else
-CONFIGURE_ARGS+=		--disable-win32dll
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mnas)
-CONFIGURE_ARGS+=	--enable-nas
-.    include "../../audio/nas/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-nas
-.  endif
-
-.  if ${OSS_TYPE} != "none" && !empty(PKG_OPTIONS:Moss)
-CONFIGURE_ARGS+=	--enable-ossaudio
-.  else
-CONFIGURE_ARGS+=	--disable-ossaudio
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mpng)
-CONFIGURE_ARGS+=	--enable-png
-.    include "../../graphics/png/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-png
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mpulseaudio)
-CONFIGURE_ARGS+=	--enable-pulse
-.    include "../../devel/glib2/buildlink3.mk"
-.    include "../../audio/pulseaudio/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-pulse
-.  endif
-
-.  if !empty(PKG_OPTIONS:Msdl)
-CONFIGURE_ARGS+=	--enable-sdl
-.    include "../../devel/SDL/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-sdl
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mtheora)
-CONFIGURE_ARGS+=	--enable-theora
-.    include "../../multimedia/libtheora/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-theora
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mv4l2)
-CONFIGURE_ARGS+=	--enable-tv-v4l2
-.  else
-CONFIGURE_ARGS+=	--disable-tv-v4l2
-.  endif
-
-# disable vidix if not in options
-.  if empty(PKG_OPTIONS:Mvidix)
-CONFIGURE_ARGS+=	--disable-vidix
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mvorbis)
-CONFIGURE_ARGS+=	--enable-libvorbis
-.  else
-CONFIGURE_ARGS+=	--disable-libvorbis
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mx264)
-.    include "../../multimedia/x264-devel/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-x264
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mxvid)
-CONFIGURE_ARGS+=	--enable-xvid
-EXTRA_LIBS+=		-lxvidcore
-.    include "../../multimedia/xvidcore/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-xvid
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mmplayer-ssse3)
-# needs a recent assembler
-.include "../../devel/binutils/buildlink3.mk"
-.include "../../devel/binutils/override-as.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-ssse3
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mvdpau)
-.    include "../../multimedia/libvdpau/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--disable-vdpau
-.  endif
-
-# -------------------------------------------------------------------------
-# Handle extra libraries (part 1)
-# -------------------------------------------------------------------------
-.  if ${EXTRA_LIBS} != ""
-CONFIGURE_ARGS+=	--extra-libs=${EXTRA_LIBS:C/^ //:Q}
-.  endif
-
-.endif # defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
diff --git a/mplayer-snapshot-share/patches/patch-aa b/mplayer-snapshot-share/patches/patch-aa
deleted file mode 100644
index c65075b900..0000000000
--- a/mplayer-snapshot-share/patches/patch-aa
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2010/09/11 13:44:27 cheusov Exp $
-
---- configure.orig	2010-09-04 09:39:21.000000000 +0000
-+++ configure
-@@ -1471,6 +1471,9 @@ if test -z "$_target" ; then
-    powerpc) # Darwin returns 'powerpc'
-      host_arch=ppc
-      ;;
-+   mipseb|mipsel) # NetBSD
-+     host_arch=mips
-+     ;;
-    *) # uname -p on Linux returns 'unknown' for the processor type,
-       # OpenBSD returns 'Intel Pentium/MMX ("Genuine Intel" 586-class)'
- 
-@@ -1645,7 +1648,7 @@ else
-       cc_name=$cc_name_tmp
-       echocheck "$_cc version"
-       cc_vendor=gnu
--      cc_version=$($_cc -dumpversion 2>&1)
-+      cc_version=$( ( $_cc -dumpversion | sed -e 's/-nb[0-9]//' ) 2>&1 )
-       case $cc_version in
-         2.96*)
-           cc_fail=yes
-@@ -1763,7 +1766,7 @@ if x86 ; then
-   # gather more CPU information
-   pname=$($_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -n 1)
-   pvendor=$($_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2  | cut -d ' ' -f 2 | head -n 1)
--  pfamily=$($_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1)
-+  pfamily=$($_cpuinfo | grep -i 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1)
-   pmodel=$($_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1)
-   pstepping=$($_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1)
- 
-@@ -3710,7 +3713,6 @@ test "$_w32threads" = yes && def_threads
- echores "$_w32threads"
- 
- echocheck "rpath"
--netbsd &&_rpath=yes
- if test "$_rpath" = yes ; then
-   for I in $(echo $extra_ldflags | sed 's/-L//g') ; do
-     tmp="$tmp $(echo $I | sed 's/.*/ -L& -Wl,-R&/')"
-@@ -3975,7 +3977,6 @@ echores "$_vsscanf"
- 
- echocheck "swab()"
- cat > $TMPC << EOF
--#define _XOPEN_SOURCE 600
- #include <unistd.h>
- int main(void) { swab(0, 0, 0); return 0; }
- EOF
-@@ -4456,7 +4457,11 @@ EOF
-            -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/local/lib64 -L/usr/X11R6/lib64 \
-            -L/usr/lib ; do
-     if netbsd; then
--      _ld_tmp="$I -lXext -lX11 $_ld_pthread -Wl,-R$(echo $I | sed s/^-L//)"
-+      if test -n "$I" ; then
-+        _ld_tmp="$I -lXext -lX11 $_ld_pthread -Wl,-R$(echo $I | sed s/^-L//)"
-+      else
-+        _ld_tmp="-lXext -lX11 $_ld_pthread"
-+      fi
-     else
-       _ld_tmp="$I -lXext -lX11 $_ld_pthread"
-     fi
-@@ -5591,8 +5596,13 @@ if test "$_ivtv" = auto ; then
-   cat > $TMPC << EOF
- #include <stdlib.h>
- #include <inttypes.h>
-++#ifdef __linux__
- #include <linux/types.h>
- #include <linux/videodev2.h>
-+#elif defined(__NetBSD__) || defined(__OpenBSD__)
-+#include <sys/types.h>
-+#include <sys/videoio.h>
-+#endif
- #include <linux/ivtv.h>
- #include <sys/ioctl.h>
- int main(void) {
-@@ -8052,7 +8062,7 @@ echores "$_tv_v4l1"
- echocheck "Video 4 Linux 2 TV interface"
- if test "$_tv_v4l2" = auto ; then
-   _tv_v4l2=no
--  if test "$_tv" = yes && linux ; then
-+  if test "$_tv" = yes && (linux || netbsd || openbsd) ; then
-     header_check linux/videodev2.h && _tv_v4l2=yes
-   fi
- fi
diff --git a/mplayer-snapshot-share/patches/patch-ac b/mplayer-snapshot-share/patches/patch-ac
deleted file mode 100644
index b39219a8ab..0000000000
--- a/mplayer-snapshot-share/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2010/09/11 13:29:40 cheusov Exp $
-
---- libfaad2/common.h.orig	2009-07-26 19:53:00.000000000 +0000
-+++ libfaad2/common.h
-@@ -320,7 +320,7 @@ char *strchr(), *strrchr();
-   #elif (defined(__i386__) && defined(__GNUC__)) && !HAVE_LRINTF
-     #define HAS_LRINTF
-     // from http://www.stereopsis.com/FPU.html
--    static INLINE int lrintf(float f)
-+    static INLINE long int lrintf(float f)
-     {
-         int i;
-         __asm__ __volatile__ (
diff --git a/mplayer-snapshot-share/patches/patch-ae b/mplayer-snapshot-share/patches/patch-ae
deleted file mode 100644
index 249d50223c..0000000000
--- a/mplayer-snapshot-share/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2010/09/11 13:29:40 cheusov Exp $
-
---- libvo/aclib.c.orig	2010-01-03 09:20:01.000000000 +0000
-+++ libvo/aclib.c
-@@ -30,6 +30,11 @@
- #include "libavutil/x86_cpu.h"
- #undef memcpy
- 
-+#if ARCH_X86 && defined(__APPLE__)
-+#undef ARCH_X86
-+#define ARCH_X86 0
-+#endif
-+
- #define BLOCK_SIZE 4096
- #define CONFUSION_FACTOR 0
- //Feel free to fine-tune the above 2, it might be possible to get some speedup with them :)
diff --git a/mplayer-snapshot-share/patches/patch-ag b/mplayer-snapshot-share/patches/patch-ag
deleted file mode 100644
index 07cba1f568..0000000000
--- a/mplayer-snapshot-share/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2010/09/07 21:52:27 cheusov Exp $
-
---- libvo/osd.c.orig	2009-04-08 22:21:21.000000000 +0200
-+++ libvo/osd.c
-@@ -29,6 +29,11 @@
- #include <inttypes.h>
- #include "cpudetect.h"
- 
-+#if ARCH_X86 && defined(__APPLE__)
-+#undef ARCH_X86
-+#define ARCH_X86 0
-+#endif
-+
- #if ARCH_X86
- static const uint64_t bFF __attribute__((aligned(8))) = 0xFFFFFFFFFFFFFFFFULL;
- static const unsigned long long mask24lh  __attribute__((aligned(8))) = 0xFFFF000000000000ULL;
diff --git a/mplayer-snapshot-share/patches/patch-ah b/mplayer-snapshot-share/patches/patch-ah
deleted file mode 100644
index d8fb4dd419..0000000000
--- a/mplayer-snapshot-share/patches/patch-ah
+++ /dev/null
@@ -1,66 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2010/09/11 13:29:40 cheusov Exp $
-
---- subreader.c.orig	2010-08-29 11:27:00.000000000 +0000
-+++ subreader.c
-@@ -94,10 +94,10 @@ static int eol(char p) {
- /* Remove leading and trailing space */
- static void trail_space(char *s) {
- 	int i = 0;
--	while (isspace(s[i])) ++i;
-+	while (isspace((unsigned char)s[i])) ++i;
- 	if (i) strcpy(s, s + i);
- 	i = strlen(s) - 1;
--	while (i > 0 && isspace(s[i])) s[i--] = '\0';
-+	while (i > 0 && isspace((unsigned char)s[i])) s[i--] = '\0';
- }
- 
- static char *stristr(const char *haystack, const char *needle) {
-@@ -725,7 +725,7 @@ static subtitle *sub_read_line_pjs(strea
-     if (!stream_read_line (st, line, LINE_LEN, utf16))
- 	return NULL;
-     /* skip spaces */
--    for (s=line; *s && isspace(*s); s++);
-+    for (s=line; *s && isspace((unsigned char)*s); s++);
-     /* allow empty lines at the end of the file */
-     if (*s==0)
- 	return NULL;
-@@ -778,7 +778,7 @@ static subtitle *sub_read_line_mpsub(str
- 			else return current;
- 		}
- 		p=line;
--		while (isspace(*p)) p++;
-+		while (isspace(*(unsigned char*)p)) p++;
- 		if (eol(*p) && num > 0) return current;
- 		if (eol(*p)) return NULL;
- 
-@@ -1824,18 +1824,18 @@ char * strreplace( char * in,char * what
- static void strcpy_trim(char *d, char *s)
- {
-     // skip leading whitespace
--    while (*s && isspace(*s)) {
-+    while (*s && isspace((unsigned char)*s)) {
- 	s++;
-     }
-     for (;;) {
- 	// copy word
--	while (*s && !isspace(*s)) {
-+	while (*s && !isspace((unsigned char)*s)) {
- 	    *d = tolower(*s);
- 	    s++; d++;
- 	}
- 	if (*s == 0) break;
- 	// trim excess whitespace
--	while (*s && isspace(*s)) {
-+	while (*s && isspace((unsigned char)*s)) {
- 	    s++;
- 	}
- 	if (*s == 0) break;
-@@ -1874,7 +1874,7 @@ static void strcpy_get_ext(char *d, char
- static int whiteonly(char *s)
- {
-     while (*s) {
--	if (!isspace(*s)) return 0;
-+	if (!isspace((unsigned char)*s)) return 0;
- 	s++;
-   }
-     return 1;
diff --git a/mplayer-snapshot-share/patches/patch-an b/mplayer-snapshot-share/patches/patch-an
deleted file mode 100644
index 8ade1def59..0000000000
--- a/mplayer-snapshot-share/patches/patch-an
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-an,v 1.1.1.1 2010/09/07 21:52:27 cheusov Exp $
-
---- stream/vcd_read_fbsd.h.orig	2008-03-10 20:28:42.000000000 +0100
-+++ stream/vcd_read_fbsd.h
-@@ -41,9 +41,8 @@ typedef struct mp_vcd_priv_st {
-   vcd_tocentry entry;
- #ifdef VCD_NETBSD
-   struct cd_toc_entry entry_data;
--#else
--  cdsector_t buf;
- #endif
-+  cdsector_t buf;
-   struct ioc_toc_header tochdr;
- } mp_vcd_priv_t;
- 
-@@ -209,8 +208,8 @@ vcd_read(mp_vcd_priv_t* vcd, char *mem)
-   sc.cmd[9] = 1 << 4; // user data only
-   sc.cmd[10] = 0;     // no subchannel
-   sc.cmdlen = 12;
--  sc.databuf = (caddr_t) mem;
--  sc.datalen = VCD_SECTOR_DATA;
-+  sc.databuf = (caddr_t) vcd->buf.data;
-+  sc.datalen = VCD_SECTOR_DATA + 4;    // MMC-3 spec says there are 4 extra bytes
-   sc.senselen = sizeof(sc.sense);
-   sc.flags = SCCMD_READ;
-   sc.timeout = 10000;
-@@ -227,9 +226,9 @@ vcd_read(mp_vcd_priv_t* vcd, char *mem)
- #else
-   if (pread(vcd->fd,&vcd->buf,VCD_SECTOR_SIZE,vcd_get_msf(vcd)*VCD_SECTOR_SIZE)
-      != VCD_SECTOR_SIZE) return 0;  // EOF?
--
--  memcpy(mem,vcd->buf.data,VCD_SECTOR_DATA);
- #endif
-+  
-+  memcpy(mem,vcd->buf.data,VCD_SECTOR_DATA);
-   vcd_inc_msf(vcd);
-   return VCD_SECTOR_DATA;
- }
diff --git a/mplayer-snapshot-share/patches/patch-ar b/mplayer-snapshot-share/patches/patch-ar
deleted file mode 100644
index fc6686827f..0000000000
--- a/mplayer-snapshot-share/patches/patch-ar
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ar,v 1.1.1.1 2010/09/07 21:52:27 cheusov Exp $
-
-Fix for SA26157.
-
---- stream/realrtsp/real.c.orig	2009-09-02 12:55:36.000000000 +0200
-+++ stream/realrtsp/real.c
-@@ -369,6 +369,9 @@ int real_get_rdt_chunk(rtsp_t *rtsp_sess
- #endif
-   size+=2;
- 
-+  if (size < 12)
-+	  return 0;
-+
-   ph.object_version=0;
-   ph.length=size;
-   ph.stream_number=(flags1>>1)&0x1f;
diff --git a/mplayer-snapshot-share/patches/patch-vb b/mplayer-snapshot-share/patches/patch-vb
deleted file mode 100644
index 7aa8ffdcf6..0000000000
--- a/mplayer-snapshot-share/patches/patch-vb
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-vb,v 1.2 2010/09/11 13:29:40 cheusov Exp $
-
---- stream/tvi_v4l2.c.orig	2010-08-03 15:55:17.000000000 +0000
-+++ stream/tvi_v4l2.c
-@@ -49,8 +49,12 @@ known issues:
- #ifdef HAVE_SYS_SYSINFO_H
- #include <sys/sysinfo.h>
- #endif
-+#ifdef __linux__
- #include <linux/types.h>
- #include <linux/videodev2.h>
-+#elif defined(__NetBSD__) || defined(__OpenBSD__)
-+#include <sys/videoio.h>
-+#endif
- #include "mp_msg.h"
- #include "libmpcodecs/img_format.h"
- #include "libmpcodecs/dec_teletext.h"
diff --git a/mplayer-snapshot-share/patches/patch-ve_x264 b/mplayer-snapshot-share/patches/patch-ve_x264
deleted file mode 100644
index 58ebe5831d..0000000000
--- a/mplayer-snapshot-share/patches/patch-ve_x264
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ve_x264,v 1.1.1.1 2010/09/07 21:52:27 cheusov Exp $
-
---- libmpcodecs/ve_x264.c.orig	2009-09-23 14:26:44.000000000 +0200
-+++ libmpcodecs/ve_x264.c
-@@ -198,8 +198,13 @@ static int control(struct vf_instance_s*
-     h264_module_t *mod=(h264_module_t*)vf->priv;
-     switch(request){
-         case VFCTRL_FLUSH_FRAMES:
-+#if X264_BUILD > 70
-             while (x264_encoder_delayed_frames(mod->x264) > 0)
-                 encode_frame(vf, NULL);
-+#else
-+	    if(param.i_bframe)
-+		    while(encode_frame(vf, NULL) > 0);
-+#endif
-             return CONTROL_TRUE;
-         default:
-             return CONTROL_UNKNOWN;
diff --git a/mplayer-snapshot/DESCR b/mplayer-snapshot/DESCR
deleted file mode 100644
index 3a81d317e2..0000000000
--- a/mplayer-snapshot/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-MPlayer is a movie player for LINUX (runs on many other Unices,
-and non-x86 CPUs). It plays most MPEG, VOB, AVI, VIVO, ASF/WMV,
-QT/MOV, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ files, supported
-by many native, XAnim, and Win32 DLL codecs. You can watch VideoCD,
-SVCD, DVD, 3ivx, and even DivX movies too. The another big feature
-of mplayer is the wide range of supported output drivers. It works
-with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, AAlib, DirectFB, but
-you can use GGI and SDL (and this way all their drivers) and some
-lowlevel card-specific drivers (for Matrox, 3Dfx, and Radeon) too!
-Most of them support software or hardware scaling, so you can
-enjoy movies in fullscreen. It also sports nice big antialiased
-shaded subtitles (10 supported types) with european/ISO 8859-1,
-2 (hungarian, english, czech, etc), cyrillic, korean fonts, and
-OSD.
diff --git a/mplayer-snapshot/Makefile b/mplayer-snapshot/Makefile
deleted file mode 100644
index ec23e3f468..0000000000
--- a/mplayer-snapshot/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2012/10/28 23:40:34 thomasklausner Exp $
-
-PKGNAME=	mplayer-${MPLAYER_VERSION}
-PKGREVISION=	1
-
-COMMENT=	Fast, cross-platform movie player
-
-.include "../../wip/mplayer-snapshot-share/Makefile.common"
-
-USE_TOOLS+=	pkg-config
-
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-BUILD_DEPENDS+=		yasm-[0-9]*:../../devel/yasm
-.endif
-
-CONFIGURE_ARGS+=	--disable-mencoder
-CONFIGURE_ARGS+=	--confdir=${PREFIX}/share/mplayer
-CONFIGURE_ARGS+=	--enable-xvmc
-
-# Solaris/x86 has Xv, but the header files live in /usr/X11R6, not
-# ${X11_BASE}, so we need to also look for headers in this path.
-.if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "i386"
-CPPFLAGS+=		-I/usr/X11R6/include
-BUILDLINK_PASSTHRU_DIRS+=	/usr/X11R6/include
-.endif
-
-INSTALLATION_DIRS+=	bin
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mplayer ${DESTDIR}${PREFIX}/bin
-
-.include "../../x11/libXScrnSaver/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libXv/buildlink3.mk"
-.include "../../x11/libXvMC/buildlink3.mk"
-.include "../../x11/libXxf86dga/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
-
-.include "../../graphics/MesaLib/buildlink3.mk"
-
-.include "../../wip/mplayer-snapshot-share/Makefile.depends"
-
-.include "../../mk/bsd.pkg.mk"
-.include "../../wip/mplayer-snapshot-share/Makefile.cflags"
diff --git a/mplayer-snapshot/PLIST b/mplayer-snapshot/PLIST
deleted file mode 100644
index 16514880f7..0000000000
--- a/mplayer-snapshot/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/09/07 21:53:41 cheusov Exp $
-bin/mplayer


Home | Main Index | Thread Index | Old Index