summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--graphics/gmplayer/Makefile12
-rw-r--r--graphics/gmplayer/distinfo6
-rw-r--r--graphics/mencoder/Makefile11
-rw-r--r--graphics/mencoder/distinfo6
-rw-r--r--graphics/mplayer-share/Makefile.common18
-rw-r--r--graphics/mplayer-share/Makefile.depends15
-rw-r--r--graphics/mplayer-share/PLIST10
-rw-r--r--graphics/mplayer-share/distinfo6
-rw-r--r--graphics/mplayer/Makefile12
-rw-r--r--graphics/mplayer/distinfo6
10 files changed, 50 insertions, 52 deletions
diff --git a/graphics/gmplayer/Makefile b/graphics/gmplayer/Makefile
index 6460ec2a3ab..14ffddf4fa8 100644
--- a/graphics/gmplayer/Makefile
+++ b/graphics/gmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/05/25 07:56:01 veego Exp $
+# $NetBSD: Makefile,v 1.8 2002/06/08 23:41:55 veego Exp $
.include "../../graphics/mplayer-share/Makefile.common"
@@ -40,8 +40,6 @@ SITES_${skin}= ${SKIN_SITES}
DISTFILES+= ${DISTNAME}${EXTRACT_SUFX}
DISTFILES+= ${SKINS}
-DEPENDS+= mplayer-share>=0.90rc4nb1:../../graphics/mplayer-share
-
CONFIGURE_ARGS+= --enable-gui
CONFIGURE_ARGS+= --disable-mencoder
@@ -56,11 +54,7 @@ do-install:
@${CHMOD} -R a+r ${PREFIX}/share/mplayer/Skin
@${CHMOD} a+rx ${PREFIX}/share/mplayer/Skin/*
-.include "../../devel/SDL/buildlink.mk"
-.include "../../graphics/jpeg/buildlink.mk"
-.include "../../graphics/png/buildlink.mk"
-.include "../../misc/libdvdread/buildlink.mk"
+.include "../../audio/nas/buildlink.mk"
.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/ossaudio.buildlink.mk"
-.include "../../mk/pthread.buildlink.mk"
+.include "../../graphics/mplayer-share/Makefile.depends"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gmplayer/distinfo b/graphics/gmplayer/distinfo
index cc43933b001..84b786b8b02 100644
--- a/graphics/gmplayer/distinfo
+++ b/graphics/gmplayer/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2002/05/25 07:56:01 veego Exp $
+$NetBSD: distinfo,v 1.11 2002/06/08 23:41:55 veego Exp $
-SHA1 (mplayer/MPlayer-0.90pre4.tar.bz2) = 54621d010d5fb28e1ad2f857135543c3bd466d50
-Size (mplayer/MPlayer-0.90pre4.tar.bz2) = 2424843 bytes
+SHA1 (mplayer/MPlayer-0.90pre5.tar.bz2) = 1a78063dd055ce99985001072fb2057156f8cd2a
+Size (mplayer/MPlayer-0.90pre5.tar.bz2) = 2438747 bytes
SHA1 (mplayer/default.tar.bz2) = 72eb4f088e19b20d3b861180525dffde4796a27d
Size (mplayer/default.tar.bz2) = 167746 bytes
SHA1 (mplayer/MidnightLove.tar.bz2) = 7464060fbffd8ac93402616426620a590fda8d7f
diff --git a/graphics/mencoder/Makefile b/graphics/mencoder/Makefile
index 30798da5387..e9895bd9d1c 100644
--- a/graphics/mencoder/Makefile
+++ b/graphics/mencoder/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/25 07:58:01 veego Exp $
+# $NetBSD: Makefile,v 1.2 2002/06/08 23:41:56 veego Exp $
.include "../../graphics/mplayer-share/Makefile.common"
PKGNAME= mencoder-${MPLAYER_PKG_VERSION}
COMMENT= Simple movie encoder for MPlayer-playable movies
-DEPENDS+= mplayer-share>=0.90rc4:../../graphics/mplayer-share
+CONFIGURE_ARGS+= --disable-nas
ALL_TARGET= mencoder
@@ -14,10 +14,5 @@ do-install:
${LN} -s ${PREFIX}/man/man1/mplayer.1 ${PREFIX}/man/man1/mencoder.1
.include "../../audio/lame/buildlink.mk"
-.include "../../devel/SDL/buildlink.mk"
-.include "../../graphics/jpeg/buildlink.mk"
-.include "../../graphics/png/buildlink.mk"
-.include "../../misc/libdvdread/buildlink.mk"
-.include "../../mk/ossaudio.buildlink.mk"
-.include "../../mk/pthread.buildlink.mk"
+.include "../../graphics/mplayer-share/Makefile.depends"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/mencoder/distinfo b/graphics/mencoder/distinfo
index 84da7427da4..b683ff0635e 100644
--- a/graphics/mencoder/distinfo
+++ b/graphics/mencoder/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/25 07:58:01 veego Exp $
+$NetBSD: distinfo,v 1.2 2002/06/08 23:41:56 veego Exp $
-SHA1 (mplayer/MPlayer-0.90pre4.tar.bz2) = 54621d010d5fb28e1ad2f857135543c3bd466d50
-Size (mplayer/MPlayer-0.90pre4.tar.bz2) = 2424843 bytes
+SHA1 (mplayer/MPlayer-0.90pre5.tar.bz2) = 1a78063dd055ce99985001072fb2057156f8cd2a
+Size (mplayer/MPlayer-0.90pre5.tar.bz2) = 2438747 bytes
SHA1 (patch-aa) = 2c1c6f35caf047f188871ac223d672ce453c26ec
diff --git a/graphics/mplayer-share/Makefile.common b/graphics/mplayer-share/Makefile.common
index 686137d1ae5..b8cb791031d 100644
--- a/graphics/mplayer-share/Makefile.common
+++ b/graphics/mplayer-share/Makefile.common
@@ -1,10 +1,13 @@
-# $NetBSD: Makefile.common,v 1.2 2002/06/01 20:31:26 wiz Exp $
+# $NetBSD: Makefile.common,v 1.3 2002/06/08 23:41:56 veego Exp $
-MPLAYER_DIST_VERSION= 0.90pre4
+MPLAYER_DIST_VERSION= 0.90pre5
+
+# There is no need to change anything below here.
+
+# This variable is used in all packages which depend on this package
MPLAYER_PKG_VERSION= ${MPLAYER_DIST_VERSION:S/pre/rc/}
DISTNAME= MPlayer-${MPLAYER_DIST_VERSION}
-PKGREVISION=1
CATEGORIES?= graphics
MASTER_SITES= http://www.mplayerhq.hu/MPlayer/releases/ \
http://www2.mplayerhq.hu/MPlayer/releases/ \
@@ -26,7 +29,6 @@ NO_BIN_ON_FTP= ${RESTRICTED}
# no source on the ftp server because of the css source code in it
NO_SRC_ON_FTP= ${RESTRICTED}
-USE_X11= YES
USE_GMAKE= YES
HAS_CONFIGURE= YES
@@ -37,6 +39,11 @@ CONFIGURE_ARGS+= --with-extraincdir="${BUILDLINK_DIR}/include"
CONFIGURE_ARGS+= --with-extralibdir="${LOCALBASE}/lib"
#CONFIGURE_ARGS+= --enable-dvdread
CONFIGURE_ARGS+= --disable-mpdvdkit
+CONFIGURE_ARGS+= --disable-ossaudio
+
+# Buildlink's ${CFLAGS} setting triggers configure's bozo switch, turning
+# off all the processor-specific optimizations.
+CONFIGURE_ENV+= CFLAGS=""
# The configure script attempts to test-execute compiled programs in /tmp,
# but that directory may be mounted as noexec; work this around by setting
@@ -48,6 +55,3 @@ CONFIGURE_ENV+= TMPDIR=${WRKDIR}
.if ${MACHINE_ARCH} == "i386"
CONFIGURE_ARGS+= --with-win32libdir="${LOCALBASE}/lib/win32"
.endif
-
-.include "../../devel/binutils/buildlink.mk"
-.include "../../lang/gcc/Makefile.gcc"
diff --git a/graphics/mplayer-share/Makefile.depends b/graphics/mplayer-share/Makefile.depends
new file mode 100644
index 00000000000..e1d51d5fe53
--- /dev/null
+++ b/graphics/mplayer-share/Makefile.depends
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile.depends,v 1.1 2002/06/08 23:41:56 veego Exp $
+
+DEPENDS+= mplayer-share-${MPLAYER_PKG_VERSION}${PKGREVISION:Dnb${PKGREVISION}}:../../graphics/mplayer-share
+
+.include "../../audio/mad/buildlink.mk"
+.include "../../devel/binutils/buildlink.mk"
+.include "../../devel/SDL/buildlink.mk"
+.include "../../graphics/jpeg/buildlink.mk"
+.include "../../graphics/libungif/buildlink.mk"
+.include "../../graphics/png/buildlink.mk"
+.include "../../lang/gcc/Makefile.gcc"
+.include "../../misc/libdvdread/buildlink.mk"
+.include "../../mk/ossaudio.buildlink.mk"
+.include "../../mk/pthread.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
diff --git a/graphics/mplayer-share/PLIST b/graphics/mplayer-share/PLIST
index 9eeef8efa43..42ca303ccff 100644
--- a/graphics/mplayer-share/PLIST
+++ b/graphics/mplayer-share/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/25 07:51:22 veego Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/06/08 23:41:56 veego Exp $
man/man1/mplayer.1
share/mplayer/DOCS/DVB
share/mplayer/DOCS/DXR3
@@ -18,7 +18,6 @@ share/mplayer/DOCS/German/documentation.html
share/mplayer/DOCS/German/encoding.html
share/mplayer/DOCS/German/faq.html
share/mplayer/DOCS/German/formats.html
-share/mplayer/DOCS/German/gcc-2.96-3.0.html
share/mplayer/DOCS/German/mencoder.1
share/mplayer/DOCS/German/mplayer.1
share/mplayer/DOCS/German/sound.html
@@ -42,7 +41,6 @@ share/mplayer/DOCS/Italian/documentation.html
share/mplayer/DOCS/Italian/encoding.html
share/mplayer/DOCS/Italian/faq.html
share/mplayer/DOCS/Italian/formats.html
-share/mplayer/DOCS/Italian/gcc-2.96-3.0.html
share/mplayer/DOCS/Italian/skin-it.html
share/mplayer/DOCS/Italian/sound.html
share/mplayer/DOCS/Italian/users_against_developers.html
@@ -63,9 +61,6 @@ share/mplayer/DOCS/Polish/skin-pl.html
share/mplayer/DOCS/Polish/sound.html
share/mplayer/DOCS/Polish/users_against_developers.html
share/mplayer/DOCS/Polish/video.html
-share/mplayer/DOCS/SGML/DO_NOT_USE
-share/mplayer/DOCS/SGML/c
-share/mplayer/DOCS/SGML/docs.sgml
share/mplayer/DOCS/bugreports.html
share/mplayer/DOCS/cd-dvd.html
share/mplayer/DOCS/codecs-in.html
@@ -74,7 +69,6 @@ share/mplayer/DOCS/documentation.html
share/mplayer/DOCS/encoding.html
share/mplayer/DOCS/faq.html
share/mplayer/DOCS/formats.html
-share/mplayer/DOCS/gcc-2.96-3.0.html
share/mplayer/DOCS/mplayer.1
share/mplayer/DOCS/skin-en.html
share/mplayer/DOCS/sound.html
@@ -87,6 +81,7 @@ share/mplayer/DOCS/tech/dr-methods.txt
share/mplayer/DOCS/tech/formats-hun.txt
share/mplayer/DOCS/tech/formats.txt
share/mplayer/DOCS/tech/hwac3.txt
+share/mplayer/DOCS/tech/libavc-rate-control.txt
share/mplayer/DOCS/tech/libvo.txt
share/mplayer/DOCS/tech/libvo2.txt
share/mplayer/DOCS/tech/mpsub.sub
@@ -94,6 +89,7 @@ share/mplayer/DOCS/tech/osd.txt
share/mplayer/DOCS/tech/patches.txt
share/mplayer/DOCS/tech/playtree
share/mplayer/DOCS/tech/playtree-hun
+share/mplayer/DOCS/tech/porting-status.txt
share/mplayer/DOCS/tech/subcp.txt
share/mplayer/DOCS/tech/tech-eng.txt
share/mplayer/DOCS/tech/vidix.txt
diff --git a/graphics/mplayer-share/distinfo b/graphics/mplayer-share/distinfo
index 9ec50013b2b..50a663ddede 100644
--- a/graphics/mplayer-share/distinfo
+++ b/graphics/mplayer-share/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/25 07:51:22 veego Exp $
+$NetBSD: distinfo,v 1.2 2002/06/08 23:41:56 veego Exp $
-SHA1 (mplayer/MPlayer-0.90pre4.tar.bz2) = 54621d010d5fb28e1ad2f857135543c3bd466d50
-Size (mplayer/MPlayer-0.90pre4.tar.bz2) = 2424843 bytes
+SHA1 (mplayer/MPlayer-0.90pre5.tar.bz2) = 1a78063dd055ce99985001072fb2057156f8cd2a
+Size (mplayer/MPlayer-0.90pre5.tar.bz2) = 2438747 bytes
SHA1 (mplayer/mp-arial-iso-8859-1.zip) = 535809c2745d5dfa79d1243cbe225ee030e626ac
Size (mplayer/mp-arial-iso-8859-1.zip) = 272659 bytes
SHA1 (mplayer/mp-arial-iso-8859-2.zip) = a1ef7ea4f4349cd4451052351f7c300597a1b5d3
diff --git a/graphics/mplayer/Makefile b/graphics/mplayer/Makefile
index 69edc7ee43a..33d3d9e45b1 100644
--- a/graphics/mplayer/Makefile
+++ b/graphics/mplayer/Makefile
@@ -1,21 +1,15 @@
-# $NetBSD: Makefile,v 1.25 2002/05/25 07:56:02 veego Exp $
+# $NetBSD: Makefile,v 1.26 2002/06/08 23:41:56 veego Exp $
.include "../../graphics/mplayer-share/Makefile.common"
PKGNAME= mplayer-${MPLAYER_PKG_VERSION}
COMMENT= Software only MPEG-1/2/4 video decoder
-DEPENDS+= mplayer-share>=0.90rc4nb1:../../graphics/mplayer-share
-
CONFIGURE_ARGS+= --disable-mencoder
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/mplayer ${PREFIX}/bin
-.include "../../devel/SDL/buildlink.mk"
-.include "../../graphics/jpeg/buildlink.mk"
-.include "../../graphics/png/buildlink.mk"
-.include "../../misc/libdvdread/buildlink.mk"
-.include "../../mk/ossaudio.buildlink.mk"
-.include "../../mk/pthread.buildlink.mk"
+.include "../../audio/nas/buildlink.mk"
+.include "../../graphics/mplayer-share/Makefile.depends"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/mplayer/distinfo b/graphics/mplayer/distinfo
index 1bde2c70eb1..ccac3f933d3 100644
--- a/graphics/mplayer/distinfo
+++ b/graphics/mplayer/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2002/05/25 07:56:02 veego Exp $
+$NetBSD: distinfo,v 1.14 2002/06/08 23:41:56 veego Exp $
-SHA1 (mplayer/MPlayer-0.90pre4.tar.bz2) = 54621d010d5fb28e1ad2f857135543c3bd466d50
-Size (mplayer/MPlayer-0.90pre4.tar.bz2) = 2424843 bytes
+SHA1 (mplayer/MPlayer-0.90pre5.tar.bz2) = 1a78063dd055ce99985001072fb2057156f8cd2a
+Size (mplayer/MPlayer-0.90pre5.tar.bz2) = 2438747 bytes
SHA1 (patch-aa) = 2c1c6f35caf047f188871ac223d672ce453c26ec
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-22 16:51:49 +0000