pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc move smpeg to multimedia/
details: https://anonhg.NetBSD.org/pkgsrc/rev/0d35857a3fa9
branches: trunk
changeset: 477043:0d35857a3fa9
user: grant <grant%pkgsrc.org@localhost>
date: Sat Jun 26 09:16:10 2004 +0000
description:
move smpeg to multimedia/
diffstat:
audio/SDL_mixer/Makefile | 4 ++--
audio/SDL_sound/Makefile | 4 ++--
devel/Makefile | 3 +--
devel/p5-SDL/Makefile | 4 ++--
devel/smpeg/DESCR | 4 ----
devel/smpeg/Makefile | 36 ------------------------------------
devel/smpeg/PLIST | 25 -------------------------
devel/smpeg/buildlink3.mk | 21 ---------------------
devel/smpeg/distinfo | 7 -------
devel/smpeg/patches/patch-aa | 26 --------------------------
devel/smpeg/patches/patch-ab | 23 -----------------------
devel/smpeg/patches/patch-ac | 13 -------------
games/asc/Makefile | 4 ++--
games/gtkmagnetic/Makefile | 4 ++--
games/icebreaker/Makefile | 4 ++--
graphics/dumpmpeg/Makefile | 4 ++--
graphics/smpeg-xmms/Makefile | 4 ++--
multimedia/Makefile | 3 ++-
multimedia/smpeg/DESCR | 4 ++++
multimedia/smpeg/Makefile | 36 ++++++++++++++++++++++++++++++++++++
multimedia/smpeg/PLIST | 25 +++++++++++++++++++++++++
multimedia/smpeg/buildlink3.mk | 21 +++++++++++++++++++++
multimedia/smpeg/distinfo | 7 +++++++
multimedia/smpeg/patches/patch-aa | 26 ++++++++++++++++++++++++++
multimedia/smpeg/patches/patch-ab | 23 +++++++++++++++++++++++
multimedia/smpeg/patches/patch-ac | 13 +++++++++++++
26 files changed, 174 insertions(+), 174 deletions(-)
diffs (truncated from 551 to 300 lines):
diff -r 121d0a1fbd65 -r 0d35857a3fa9 audio/SDL_mixer/Makefile
--- a/audio/SDL_mixer/Makefile Sat Jun 26 06:59:38 2004 +0000
+++ b/audio/SDL_mixer/Makefile Sat Jun 26 09:16:10 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/04/12 23:15:01 salo Exp $
+# $NetBSD: Makefile,v 1.14 2004/06/26 09:16:10 grant Exp $
#
DISTNAME= SDL_mixer-1.2.5
@@ -29,7 +29,7 @@
${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/playwave ${PREFIX}/bin
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/smpeg/buildlink3.mk"
.include "../../multimedia/libogg/buildlink3.mk"
+.include "../../multimedia/smpeg/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 121d0a1fbd65 -r 0d35857a3fa9 audio/SDL_sound/Makefile
--- a/audio/SDL_sound/Makefile Sat Jun 26 06:59:38 2004 +0000
+++ b/audio/SDL_sound/Makefile Sat Jun 26 09:16:10 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/03/07 06:58:39 snj Exp $
+# $NetBSD: Makefile,v 1.9 2004/06/26 09:16:10 grant Exp $
#
DISTNAME= SDL_sound-1.0.1
@@ -17,5 +17,5 @@
.include "../../audio/libmikmod/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/smpeg/buildlink3.mk"
+.include "../../multimedia/smpeg/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 121d0a1fbd65 -r 0d35857a3fa9 devel/Makefile
--- a/devel/Makefile Sat Jun 26 06:59:38 2004 +0000
+++ b/devel/Makefile Sat Jun 26 09:16:10 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.507 2004/06/24 03:47:34 xtraeme Exp $
+# $NetBSD: Makefile,v 1.508 2004/06/26 09:16:10 grant Exp $
#
COMMENT= Development utilities
@@ -449,7 +449,6 @@
SUBDIR+= silc-toolkit
SUBDIR+= slib
SUBDIR+= sml-mode
-SUBDIR+= smpeg
SUBDIR+= spiff
SUBDIR+= splint
SUBDIR+= st
diff -r 121d0a1fbd65 -r 0d35857a3fa9 devel/p5-SDL/Makefile
--- a/devel/p5-SDL/Makefile Sat Jun 26 06:59:38 2004 +0000
+++ b/devel/p5-SDL/Makefile Sat Jun 26 09:16:10 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/06/18 19:00:34 salo Exp $
+# $NetBSD: Makefile,v 1.19 2004/06/26 09:16:10 grant Exp $
#
DISTNAME= SDL_perl-1.19.2
@@ -20,12 +20,12 @@
.include "../../devel/SDL/buildlink3.mk"
.include "../../devel/SDL_gfx/buildlink3.mk"
.include "../../devel/SDL_ttf/buildlink3.mk"
-.include "../../devel/smpeg/buildlink3.mk"
.include "../../graphics/SDL_image/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../lang/perl5/module.mk"
+.include "../../multimedia/smpeg/buildlink3.mk"
.include "../../net/SDL_net/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 121d0a1fbd65 -r 0d35857a3fa9 devel/smpeg/DESCR
--- a/devel/smpeg/DESCR Sat Jun 26 06:59:38 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-SMPEG is based on UC Berkeley's mpeg_play software MPEG decoder
-and SPLAY, an MPEG audio decoder created by Woo-jae Jung. The
-current version is capable of playing back MPEG video and sound on
-Pentium II based systems.
diff -r 121d0a1fbd65 -r 0d35857a3fa9 devel/smpeg/Makefile
--- a/devel/smpeg/Makefile Sat Jun 26 06:59:38 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2004/06/15 14:03:36 grant Exp $
-#
-
-DISTNAME= smpeg-0.4.4
-PKGREVISION= 6
-CATEGORIES= devel
-MASTER_SITES= ftp://sunsite.auc.dk/pub/os/linux/loki/open-source/smpeg/ \
- ftp://ftp.linuxgames.com/loki/open-source/smpeg/
-
-MAINTAINER= wulf%NetBSD.org@localhost
-HOMEPAGE= http://www.lokigames.com/development/smpeg.php3
-COMMENT= SDL MPEG Player Library
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-USE_BUILDLINK3= yes
-USE_GNU_TOOLS+= make
-GNU_CONFIGURE= yes
-USE_GCC_SHLIB= yes
-USE_LANGUAGES= c c++
-USE_X11= yes
-USE_LIBTOOL= yes
-
-.include "../../mk/compiler.mk"
-
-.if !empty(CC_VERSION:MSun)
-LIBS.SunOS+= -lCrun
-.endif
-
-CPPFLAGS+= -Dunix=1
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff -r 121d0a1fbd65 -r 0d35857a3fa9 devel/smpeg/PLIST
--- a/devel/smpeg/PLIST Sat Jun 26 06:59:38 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/02/05 20:14:05 skrll Exp $
-bin/glmovie
-bin/gtv
-bin/plaympeg
-bin/smpeg-config
-include/smpeg/MPEG.h
-include/smpeg/MPEGaction.h
-include/smpeg/MPEGaudio.h
-include/smpeg/MPEGerror.h
-include/smpeg/MPEGfilter.h
-include/smpeg/MPEGlist.h
-include/smpeg/MPEGring.h
-include/smpeg/MPEGstream.h
-include/smpeg/MPEGsystem.h
-include/smpeg/MPEGvideo.h
-include/smpeg/smpeg.h
-lib/libsmpeg-0.4.so.1
-lib/libsmpeg-0.4.so.1.3
-lib/libsmpeg.a
-lib/libsmpeg.la
-lib/libsmpeg.so
-man/man1/gtv.1
-man/man1/plaympeg.1
-share/aclocal/smpeg.m4
-@dirrm include/smpeg
diff -r 121d0a1fbd65 -r 0d35857a3fa9 devel/smpeg/buildlink3.mk
--- a/devel/smpeg/buildlink3.mk Sat Jun 26 06:59:38 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:11 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-SPMEG_BUILDLINK3_MK:= ${SPMEG_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= smpeg
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsmpeg}
-BUILDLINK_PACKAGES+= smpeg
-
-.if !empty(SPMEG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.smpeg+= smpeg>=0.4.4nb3
-BUILDLINK_PKGSRCDIR.smpeg?= ../../devel/smpeg
-.endif # SMPEG_BUILDLINK3_MK
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 121d0a1fbd65 -r 0d35857a3fa9 devel/smpeg/distinfo
--- a/devel/smpeg/distinfo Sat Jun 26 06:59:38 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.8 2004/03/01 01:46:57 kristerw Exp $
-
-SHA1 (smpeg-0.4.4.tar.gz) = 6d7f4449472e6270ab435b2224f3fad951c35259
-Size (smpeg-0.4.4.tar.gz) = 315054 bytes
-SHA1 (patch-aa) = 0a691663e1966dbd5d37225b11b6f5f6d9ad0bf0
-SHA1 (patch-ab) = dd6517226c672ce24aded66dd07e8e54ab7e0bb3
-SHA1 (patch-ac) = 60a8cd16216f4d2ec64b2727fa020d18dda7bec7
diff -r 121d0a1fbd65 -r 0d35857a3fa9 devel/smpeg/patches/patch-aa
--- a/devel/smpeg/patches/patch-aa Sat Jun 26 06:59:38 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/07/28 09:52:31 jmmv Exp $
-
---- plaympeg.c.orig Tue Feb 4 15:59:22 2003
-+++ plaympeg.c Tue Feb 4 15:59:48 2003
-@@ -492,6 +492,7 @@
- int fd;
- char buf[32];
- int status;
-+ int (*audio_init)();
-
- /* Get the command line options */
- use_audio = 1;
-@@ -600,7 +601,12 @@
- }
-
- if ( use_audio ) {
-- if ((SDL_Init(SDL_INIT_AUDIO) < 0) || !SDL_AudioDriverName(buf, 1)) {
-+ if ( use_video )
-+ audio_init = SDL_InitSubSystem;
-+ else
-+ audio_init = SDL_Init;
-+
-+ if ((audio_init(SDL_INIT_AUDIO) < 0) || !SDL_AudioDriverName(buf, 1)) {
- fprintf(stderr, "Warning: Couldn't init SDL audio: %s\n",
- SDL_GetError());
- fprintf(stderr, "Will ignore audio stream\n");
diff -r 121d0a1fbd65 -r 0d35857a3fa9 devel/smpeg/patches/patch-ab
--- a/devel/smpeg/patches/patch-ab Sat Jun 26 06:59:38 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/02/07 13:50:27 wiz Exp $
-
---- Makefile.in.orig 2001-06-18 22:59:14.000000000 +0200
-+++ Makefile.in
-@@ -310,15 +310,15 @@ uninstall-binPROGRAMS:
-
- plaympeg: $(plaympeg_OBJECTS) $(plaympeg_DEPENDENCIES)
- @rm -f plaympeg
-- $(LINK) $(plaympeg_LDFLAGS) $(plaympeg_OBJECTS) $(plaympeg_LDADD) $(LIBS)
-+ $(CXXLINK) $(plaympeg_LDFLAGS) $(plaympeg_OBJECTS) $(plaympeg_LDADD) $(LIBS)
-
- gtv: $(gtv_OBJECTS) $(gtv_DEPENDENCIES)
- @rm -f gtv
-- $(LINK) $(gtv_LDFLAGS) $(gtv_OBJECTS) $(gtv_LDADD) $(LIBS)
-+ $(CXXLINK) $(gtv_LDFLAGS) $(gtv_OBJECTS) $(gtv_LDADD) $(LIBS)
-
- glmovie: $(glmovie_OBJECTS) $(glmovie_DEPENDENCIES)
- @rm -f glmovie
-- $(LINK) $(glmovie_LDFLAGS) $(glmovie_OBJECTS) $(glmovie_LDADD) $(LIBS)
-+ $(CXXLINK) $(glmovie_LDFLAGS) $(glmovie_OBJECTS) $(glmovie_LDADD) $(LIBS)
-
- install-binSCRIPTS: $(bin_SCRIPTS)
- @$(NORMAL_INSTALL)
diff -r 121d0a1fbd65 -r 0d35857a3fa9 devel/smpeg/patches/patch-ac
--- a/devel/smpeg/patches/patch-ac Sat Jun 26 06:59:38 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/03/01 01:46:57 kristerw Exp $
-
---- video/video.h.orig 2004-03-01 02:14:39.000000000 +0100
-+++ video/video.h 2004-03-01 02:16:02.000000000 +0100
-@@ -413,7 +413,7 @@
- #define __SCO__ 1
- #endif
-
--#if defined(__i386__) || defined(__VAX__) || defined(__MIPSEL__) || defined(__alpha__) || defined(__SCO__)
-+#if defined(__x86_64__) || defined(__i386__) || defined(__VAX__) || defined(__MIPSEL__) || defined(__alpha__) || defined(__SCO__)
- #undef BIG_ENDIAN_ARCHITECTURE
- #define LITTLE_ENDIAN_ARCHITECTURE 1
- #endif
diff -r 121d0a1fbd65 -r 0d35857a3fa9 games/asc/Makefile
--- a/games/asc/Makefile Sat Jun 26 06:59:38 2004 +0000
+++ b/games/asc/Makefile Sat Jun 26 09:16:10 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/03/12 20:06:29 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2004/06/26 09:16:10 grant Exp $
#
DISTNAME= asc-source-1.14.0.0
@@ -33,7 +33,7 @@
.include "../../audio/SDL_mixer/buildlink3.mk"
.include "../../devel/SDLmm/buildlink3.mk"
.include "../../devel/libsigc++/buildlink3.mk"
-.include "../../devel/smpeg/buildlink3.mk"
.include "../../graphics/SDL_image/buildlink3.mk"
+.include "../../multimedia/smpeg/buildlink3.mk"
.include "../../x11/paragui/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 121d0a1fbd65 -r 0d35857a3fa9 games/gtkmagnetic/Makefile
--- a/games/gtkmagnetic/Makefile Sat Jun 26 06:59:38 2004 +0000
+++ b/games/gtkmagnetic/Makefile Sat Jun 26 09:16:10 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/05/04 16:25:15 dillo Exp $
+# $NetBSD: Makefile,v 1.2 2004/06/26 09:16:10 grant Exp $
#
DISTNAME= Magnetic22Src
@@ -21,6 +21,6 @@
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gtkmagnetic
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gtkmagnetic
-.include "../../devel/smpeg/buildlink3.mk"
+.include "../../multimedia/smpeg/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 121d0a1fbd65 -r 0d35857a3fa9 games/icebreaker/Makefile
--- a/games/icebreaker/Makefile Sat Jun 26 06:59:38 2004 +0000
+++ b/games/icebreaker/Makefile Sat Jun 26 09:16:10 2004 +0000
@@ -1,4 +1,4 @@
Home |
Main Index |
Thread Index |
Old Index