diff options
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/libtheora/Makefile | 9 | ||||
-rw-r--r-- | multimedia/libtheora/PLIST | 40 | ||||
-rw-r--r-- | multimedia/libtheora/distinfo | 14 | ||||
-rw-r--r-- | multimedia/libtheora/patches/patch-aa | 23 | ||||
-rw-r--r-- | multimedia/libtheora/patches/patch-ab | 10 | ||||
-rw-r--r-- | multimedia/libtheora/patches/patch-ac | 10 |
6 files changed, 38 insertions, 68 deletions
diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile index 770659ecb04..bf337b28e0e 100644 --- a/multimedia/libtheora/Makefile +++ b/multimedia/libtheora/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:42 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/10/12 21:59:42 wiz Exp $ # -DISTNAME= libtheora-1.0alpha4 +DISTNAME= libtheora-1.0alpha5 CATEGORIES= multimedia MASTER_SITES= http://downloads.xiph.org/releases/theora/ EXTRACT_SUFX= .tar.bz2 @@ -10,9 +10,10 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.theora.org/ COMMENT= Video codec for Ogg multimedia streaming -GNU_CONFIGURE= YES +GNU_CONFIGURE= YES PKGCONFIG_OVERRIDE= theora.pc.in -USE_LIBTOOL= YES +USE_LIBTOOL= YES +TEST_TARGET= check .include "../../audio/libvorbis/buildlink3.mk" .include "../../multimedia/libogg/buildlink3.mk" diff --git a/multimedia/libtheora/PLIST b/multimedia/libtheora/PLIST index e81e513641b..24f96021b81 100644 --- a/multimedia/libtheora/PLIST +++ b/multimedia/libtheora/PLIST @@ -1,47 +1,9 @@ -@comment $NetBSD: PLIST,v 1.3 2005/02/07 15:10:41 wiz Exp $ +@comment $NetBSD: PLIST,v 1.4 2005/10/12 21:59:42 wiz Exp $ include/theora/theora.h lib/libtheora.la lib/pkgconfig/theora.pc share/doc/${PKGNAME}/color.html share/doc/${PKGNAME}/doxygen-build.stamp -share/doc/${PKGNAME}/html/annotated.html -share/doc/${PKGNAME}/html/dir_000000.html -share/doc/${PKGNAME}/html/dir_000001.html -share/doc/${PKGNAME}/html/doxygen.css -share/doc/${PKGNAME}/html/doxygen.png -share/doc/${PKGNAME}/html/files.html -share/doc/${PKGNAME}/html/functions.html -share/doc/${PKGNAME}/html/functions_vars.html -share/doc/${PKGNAME}/html/globals.html -share/doc/${PKGNAME}/html/globals_defs.html -share/doc/${PKGNAME}/html/globals_enum.html -share/doc/${PKGNAME}/html/globals_eval.html -share/doc/${PKGNAME}/html/globals_func.html -share/doc/${PKGNAME}/html/globals_type.html -share/doc/${PKGNAME}/html/index.html -share/doc/${PKGNAME}/html/structtheora__comment.html -share/doc/${PKGNAME}/html/structtheora__info.html -share/doc/${PKGNAME}/html/structtheora__state.html -share/doc/${PKGNAME}/html/structyuv__buffer.html -share/doc/${PKGNAME}/html/theora_8h-source.html -share/doc/${PKGNAME}/html/theora_8h.html -share/doc/${PKGNAME}/latex/Helvetica.ttf -share/doc/${PKGNAME}/latex/Makefile -share/doc/${PKGNAME}/latex/annotated.tex -share/doc/${PKGNAME}/latex/dir_000000.tex -share/doc/${PKGNAME}/latex/dir_000001.tex -share/doc/${PKGNAME}/latex/doxygen.sty -share/doc/${PKGNAME}/latex/files.tex -share/doc/${PKGNAME}/latex/index.tex -share/doc/${PKGNAME}/latex/refman.pdf -share/doc/${PKGNAME}/latex/refman.tex -share/doc/${PKGNAME}/latex/structtheora__comment.tex -share/doc/${PKGNAME}/latex/structtheora__info.tex -share/doc/${PKGNAME}/latex/structtheora__state.tex -share/doc/${PKGNAME}/latex/structyuv__buffer.tex -share/doc/${PKGNAME}/latex/theora_8h.tex share/doc/${PKGNAME}/vp3-format.txt -@dirrm share/doc/${PKGNAME}/latex -@dirrm share/doc/${PKGNAME}/html @dirrm share/doc/${PKGNAME} @dirrm include/theora diff --git a/multimedia/libtheora/distinfo b/multimedia/libtheora/distinfo index 6ad13012c08..d0d915757be 100644 --- a/multimedia/libtheora/distinfo +++ b/multimedia/libtheora/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.5 2005/03/21 17:16:23 dmcmahill Exp $ +$NetBSD: distinfo,v 1.6 2005/10/12 21:59:42 wiz Exp $ -SHA1 (libtheora-1.0alpha4.tar.bz2) = dc22c91dce11983d25bafd5f54b41def67e84ecc -RMD160 (libtheora-1.0alpha4.tar.bz2) = 0b637934cad94a32ec96d5ae9b26996b3d4480b3 -Size (libtheora-1.0alpha4.tar.bz2) = 1755132 bytes -SHA1 (patch-aa) = 742cbb3aef9f9e0efebaa60fd97f5302c1c24d6f -SHA1 (patch-ab) = 2d0d8e6e8aa87531c6af7ce77a3ddd266b117a1d -SHA1 (patch-ac) = 390ec107d7da1dd50584c348bb12ae82038412f1 +SHA1 (libtheora-1.0alpha5.tar.bz2) = 8e740ccd7219861de83ac17ecceb13c02ed7e24a +RMD160 (libtheora-1.0alpha5.tar.bz2) = 47317a42ef6165a167dc45bb697d6528e1209469 +Size (libtheora-1.0alpha5.tar.bz2) = 1765512 bytes +SHA1 (patch-aa) = 7a0642c237d6e8a438a1fa2d2449c9ec0087a57b +SHA1 (patch-ab) = c98e9acac047fb51c4835b782906ecfe02b92e01 +SHA1 (patch-ac) = 37f60ea4ea3292f8302417eed52ef9b549f05947 diff --git a/multimedia/libtheora/patches/patch-aa b/multimedia/libtheora/patches/patch-aa index 98fbd4f65b0..4104b23d131 100644 --- a/multimedia/libtheora/patches/patch-aa +++ b/multimedia/libtheora/patches/patch-aa @@ -1,23 +1,25 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/04/06 13:47:43 jmmv Exp $ +$NetBSD: patch-aa,v 1.2 2005/10/12 21:59:42 wiz Exp $ ---- configure.orig 2004-03-20 06:43:31.000000000 +0100 +--- configure.orig 2005-08-20 20:44:13.000000000 +0200 +++ configure -@@ -19426,6 +19426,8 @@ fi +@@ -20102,6 +20102,8 @@ fi + HAVE_SDL=no - -+# SDL is only used for the sample player; disable it. ++# SDL is only used for the sample player; disable it +if false; then # Check whether --with-sdl-prefix or --without-sdl-prefix was given. if test "${with_sdl_prefix+set}" = set; then withval="$with_sdl_prefix" -@@ -19718,11 +19720,14 @@ echo "$as_me: WARNING: *** Unable to fin +@@ -20394,6 +20396,7 @@ echo "$as_me: WARNING: *** Unable to fin rm -f conf.sdltest +fi + HAVE_OSS=no +@@ -20401,6 +20404,8 @@ HAVE_OSS=no @@ -26,11 +28,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/04/06 13:47:43 jmmv Exp $ for ac_header in sys/soundcard.h soundcard.h machine/soundcard.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -@@ -19876,6 +19881,7 @@ echo "$as_me: WARNING: OSS audio support +@@ -20556,7 +20561,7 @@ if test x$HAVE_OSS != xyes; then + { echo "$as_me:$LINENO: WARNING: OSS audio support not found -- not compiling player_example" >&5 + echo "$as_me: WARNING: OSS audio support not found -- not compiling player_example" >&2;} fi - - done +- +fi - if test x$HAVE_SDL = xyes -a x$HAVE_OSS = xyes; then + ac_enable_float=yes diff --git a/multimedia/libtheora/patches/patch-ab b/multimedia/libtheora/patches/patch-ab index c0ad26aee95..edefd8b44b8 100644 --- a/multimedia/libtheora/patches/patch-ab +++ b/multimedia/libtheora/patches/patch-ab @@ -1,8 +1,9 @@ -$NetBSD: patch-ab,v 1.1 2005/03/21 17:16:23 dmcmahill Exp $ +$NetBSD: patch-ab,v 1.2 2005/10/12 21:59:42 wiz Exp $ ---- examples/Makefile.am.orig 2004-09-24 14:25:14.000000000 -0400 -+++ examples/Makefile.am 2005-03-21 09:49:46.465883000 -0500 -@@ -12,8 +12,10 @@ +--- examples/Makefile.am.orig 2005-05-01 19:03:32.000000000 +0200 ++++ examples/Makefile.am +@@ -11,10 +11,12 @@ AM_CFLAGS = $(SDL_CFLAGS) $(OGG_CFLAGS) + LDADD = ../lib/libtheora.la $(OGG_LIBS) dump_video_SOURCES = dump_video.c -dump_video_LDADD = $(LDADD) @@ -15,3 +16,4 @@ $NetBSD: patch-ab,v 1.1 2005/03/21 17:16:23 dmcmahill Exp $ +dump_video_DEPENDENCIES = $(GETOPT_OBJS) encoder_example_SOURCES = encoder_example.c + EXTRA_encoder_example_SOURCES = getopt.c getopt1.c getopt.h diff --git a/multimedia/libtheora/patches/patch-ac b/multimedia/libtheora/patches/patch-ac index e3255aa95cb..465e30ae353 100644 --- a/multimedia/libtheora/patches/patch-ac +++ b/multimedia/libtheora/patches/patch-ac @@ -1,8 +1,9 @@ -$NetBSD: patch-ac,v 1.1 2005/03/21 17:16:23 dmcmahill Exp $ +$NetBSD: patch-ac,v 1.2 2005/10/12 21:59:42 wiz Exp $ ---- examples/Makefile.in.orig 2004-12-15 15:06:17.000000000 -0500 -+++ examples/Makefile.in 2005-03-21 09:51:44.713507000 -0500 -@@ -218,7 +218,9 @@ +--- examples/Makefile.in.orig 2005-08-20 21:30:41.000000000 +0200 ++++ examples/Makefile.in +@@ -225,9 +225,11 @@ INCLUDES = -I$(top_srcdir)/include + AM_CFLAGS = $(SDL_CFLAGS) $(OGG_CFLAGS) LDADD = ../lib/libtheora.la $(OGG_LIBS) dump_video_SOURCES = dump_video.c -dump_video_LDADD = $(LDADD) @@ -14,3 +15,4 @@ $NetBSD: patch-ac,v 1.1 2005/03/21 17:16:23 dmcmahill Exp $ +player_example_DEPENDENCIES = $(GETOPT_OBJS) encoder_example_SOURCES = encoder_example.c EXTRA_encoder_example_SOURCES = getopt.c getopt1.c getopt.h + encoder_example_LDADD = $(GETOPT_OBJS) $(LDADD) $(VORBIS_LIBS) $(VORBISENC_LIBS) |