From f35e85fa4434fd03243a7bba446549cdac965ce7 Mon Sep 17 00:00:00 2001 From: steven Date: Mon, 5 Jun 2006 12:34:29 +0000 Subject: [PATCH] update to libtheora-1.0alpha6 from maintainer Vladimir Tamara Patino ok jolan@ --- multimedia/libtheora/Makefile | 13 +++--------- multimedia/libtheora/distinfo | 8 ++++---- .../libtheora/patches/patch-Makefile_in | 12 ----------- multimedia/libtheora/patches/patch-configure | 20 ------------------- .../libtheora/patches/patch-doc_Makefile_in | 12 +++++++++++ .../patches/patch-examples_Makefile_in | 12 +++++++++++ multimedia/libtheora/pkg/PLIST | 5 ++++- 7 files changed, 35 insertions(+), 47 deletions(-) delete mode 100644 multimedia/libtheora/patches/patch-Makefile_in delete mode 100644 multimedia/libtheora/patches/patch-configure create mode 100644 multimedia/libtheora/patches/patch-doc_Makefile_in create mode 100644 multimedia/libtheora/patches/patch-examples_Makefile_in diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile index fa509429e16..35dd23a9925 100644 --- a/multimedia/libtheora/Makefile +++ b/multimedia/libtheora/Makefile @@ -1,11 +1,9 @@ -# $OpenBSD: Makefile,v 1.3 2005/12/30 05:35:56 jakemsr Exp $ +# $OpenBSD: Makefile,v 1.4 2006/06/05 12:34:29 steven Exp $ COMMENT= "open video codec" -DISTNAME= libtheora-1.0alpha4 -PKGNAME= ${DISTNAME}p0 +DISTNAME= libtheora-1.0alpha6 CATEGORIES= multimedia -SHARED_LIBS= theora 1.0 -MODGNU_SHARED_LIBS= theora '' +SHARED_LIBS= theora 1.1 MASTER_SITES= http://downloads.xiph.org/releases/theora/ @@ -27,9 +25,4 @@ USE_LIBTOOL= Yes SEPARATE_BUILD= concurrent CONFIGURE_STYLE=gnu -post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libtheora - ${INSTALL_DATA} ${WRKSRC}/doc/{color.html,vp3-format.txt} \ - ${PREFIX}/share/doc/libtheora - .include diff --git a/multimedia/libtheora/distinfo b/multimedia/libtheora/distinfo index c9b7f7fceb6..6d6807ca984 100644 --- a/multimedia/libtheora/distinfo +++ b/multimedia/libtheora/distinfo @@ -1,4 +1,4 @@ -MD5 (libtheora-1.0alpha4.tar.gz) = 75f436a980b80f8b8102ee182ddb8748 -RMD160 (libtheora-1.0alpha4.tar.gz) = 1eca6dba519c8af94fa27c4112d3d3ec41aa54d3 -SHA1 (libtheora-1.0alpha4.tar.gz) = 524416a44bcc159bfe53893bb37983046b97522c -SIZE (libtheora-1.0alpha4.tar.gz) = 2045695 +MD5 (libtheora-1.0alpha6.tar.gz) = 0309b6e6da4b3a5e5d27adfc8558a73d +RMD160 (libtheora-1.0alpha6.tar.gz) = e03f232416f0c4160bd5034bb0bc7234020b6892 +SHA1 (libtheora-1.0alpha6.tar.gz) = 93ec6eaccc841581a723c251db06138fd9e783f4 +SIZE (libtheora-1.0alpha6.tar.gz) = 1863054 diff --git a/multimedia/libtheora/patches/patch-Makefile_in b/multimedia/libtheora/patches/patch-Makefile_in deleted file mode 100644 index a66db7149f9..00000000000 --- a/multimedia/libtheora/patches/patch-Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2005/07/09 00:35:02 jolan Exp $ ---- Makefile.in.orig Wed Dec 15 14:06:17 2004 -+++ Makefile.in Fri Jul 8 19:03:16 2005 -@@ -206,7 +206,7 @@ target_cpu = @target_cpu@ - target_os = @target_os@ - target_vendor = @target_vendor@ - AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2 --SUBDIRS = lib include doc examples debian -+SUBDIRS = lib include - EXTRA_DIST = COPYING autogen.sh win32 libtheora.spec libtheora.spec.in \ - theora-uninstalled.pc.in - diff --git a/multimedia/libtheora/patches/patch-configure b/multimedia/libtheora/patches/patch-configure deleted file mode 100644 index e06f07fd168..00000000000 --- a/multimedia/libtheora/patches/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: patch-configure,v 1.2 2005/12/30 05:35:56 jakemsr Exp $ ---- configure.orig Wed Dec 15 12:06:19 2004 -+++ configure Thu Dec 29 20:56:15 2005 -@@ -19863,6 +19863,7 @@ fi - - HAVE_VORBIS=no - -+if false ; then - - if test "x$HAVE_PKG_CONFIG" = "xyes" - then -@@ -20632,7 +20633,7 @@ echo "$as_me: WARNING: OSS audio support - fi - - done -- -+fi - - if test x$HAVE_SDL = xyes -a x$HAVE_OSS = xyes; then - BUILDABLE_EXAMPLES="$BUILDABLE_EXAMPLES player_example" diff --git a/multimedia/libtheora/patches/patch-doc_Makefile_in b/multimedia/libtheora/patches/patch-doc_Makefile_in new file mode 100644 index 00000000000..802dfa79a99 --- /dev/null +++ b/multimedia/libtheora/patches/patch-doc_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-doc_Makefile_in,v 1.1 2006/06/05 12:34:29 steven Exp $ +--- doc/Makefile.in.orig Fri Jun 2 17:26:19 2006 ++++ doc/Makefile.in Fri Jun 2 17:26:28 2006 +@@ -120,7 +120,7 @@ install_sh = @install_sh@ + + SUBDIRS = #python + +-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) ++docdir = $(datadir)/doc/$(PACKAGE) + + built_docs = + diff --git a/multimedia/libtheora/patches/patch-examples_Makefile_in b/multimedia/libtheora/patches/patch-examples_Makefile_in new file mode 100644 index 00000000000..1ae96a07f7d --- /dev/null +++ b/multimedia/libtheora/patches/patch-examples_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-examples_Makefile_in,v 1.1 2006/06/05 12:34:29 steven Exp $ +--- examples/Makefile.in.orig Fri Jun 2 17:26:42 2006 ++++ examples/Makefile.in Fri Jun 2 17:27:11 2006 +@@ -216,7 +216,7 @@ encoder_example$(EXEEXT): $(encoder_exam + player_example-player_example.$(OBJEXT): player_example.c + player_example$(EXEEXT): $(player_example_OBJECTS) $(player_example_DEPENDENCIES) + @rm -f player_example$(EXEEXT) +- $(LINK) $(player_example_LDFLAGS) $(player_example_OBJECTS) $(player_example_LDADD) $(LIBS) ++# $(LINK) $(player_example_LDFLAGS) $(player_example_OBJECTS) $(player_example_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) core *.core diff --git a/multimedia/libtheora/pkg/PLIST b/multimedia/libtheora/pkg/PLIST index 1a5097a20eb..b353cf38e38 100644 --- a/multimedia/libtheora/pkg/PLIST +++ b/multimedia/libtheora/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2005/07/09 00:35:02 jolan Exp $ +@comment $OpenBSD: PLIST,v 1.2 2006/06/05 12:34:29 steven Exp $ %%SHARED%% include/theora/ include/theora/theora.h @@ -8,4 +8,7 @@ lib/pkgconfig/ lib/pkgconfig/theora.pc share/doc/libtheora/ share/doc/libtheora/color.html +share/doc/libtheora/doxygen-build.stamp +share/doc/libtheora/draft-barbato-avt-rtp-theora-00.txt +share/doc/libtheora/draft-barbato-avt-rtp-theora-00.xml share/doc/libtheora/vp3-format.txt