5 files changed, 88 insertions, 10 deletions

diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile
index 3312ab4b8ed7..9daaf4b82e86 100644
--- a/multimedia/libtheora/Makefile
+++ b/multimedia/libtheora/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libtheora
-DISTVERSION=	1.0beta2
+PORTVERSION=	1.0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.xiph.org/releases/theora/ \
 		http://distfiles.master.finkmirrors.net/
@@ -30,5 +30,6 @@ CONFIGURE_ARGS+=--disable-sdltest \
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|doc||g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's,  x86_64),  x86_64|amd64),' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/multimedia/libtheora/distinfo b/multimedia/libtheora/distinfo
index 49bfebeec18d..08e1a00ae01e 100644
--- a/multimedia/libtheora/distinfo
+++ b/multimedia/libtheora/distinfo
@@ -1,3 +1,3 @@
-MD5 (libtheora-1.0beta2.tar.bz2) = 6ed9f998a982e996ad53d3686d655cfe
-SHA256 (libtheora-1.0beta2.tar.bz2) = 8bd514ddf5836d82a97f9ff2a4b606c9ccf6ed749055a9fb79f7a335c0ef4b20
-SIZE (libtheora-1.0beta2.tar.bz2) = 1774632
+MD5 (libtheora-1.0.tar.bz2) = c963937053f45a7878954bed37ceb182
+SHA256 (libtheora-1.0.tar.bz2) = 3ae9df56e8fc75ffe26e63a13cae2ce79d079416175fb0baffe0e2de8dc91a6d
+SIZE (libtheora-1.0.tar.bz2) = 1652987
diff --git a/multimedia/libtheora/files/patch-Makefile.in b/multimedia/libtheora/files/patch-Makefile.in
index c7238fbe7521..6000ce2b645b 100644
--- a/multimedia/libtheora/files/patch-Makefile.in
+++ b/multimedia/libtheora/files/patch-Makefile.in
@@ -1,7 +1,7 @@
---- Makefile.in.orig	2007-09-18 02:54:23.000000000 -0400
-+++ Makefile.in	2007-10-09 13:37:57.000000000 -0400
-@@ -73,7 +73,7 @@
-   distclean-recursive maintainer-clean-recursive
+--- Makefile.in.orig	2008-10-29 11:36:48.000000000 +0100
++++ Makefile.in	2009-02-25 03:35:59.886902862 +0100
+@@ -80,7 +80,7 @@
+ DATA = $(pkgconfig_DATA)
  ETAGS = etags
  CTAGS = ctags
 -DIST_SUBDIRS = lib include doc tests m4 examples
@@ -9,12 +9,12 @@
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  distdir = $(PACKAGE)-$(VERSION)
  top_distdir = $(distdir)
-@@ -240,7 +240,7 @@
+@@ -274,7 +274,7 @@
  	libtheora.spec libtheora.spec.in \
  	theora-uninstalled.pc.in
  
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = theora.pc
+ pkgconfig_DATA = theora.pc theoradec.pc theoraenc.pc
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/multimedia/libtheora/files/patch-issue1515 b/multimedia/libtheora/files/patch-issue1515
new file mode 100644
index 000000000000..08fa5d4bd252
--- /dev/null
+++ b/multimedia/libtheora/files/patch-issue1515
@@ -0,0 +1,64 @@
+diff -ru lib/enc.orig/encode.c lib/enc/encode.c
+--- lib/enc.orig/encode.c	2009-02-25 00:37:51.868139315 +0100
++++ lib/enc/encode.c	2009-02-25 00:23:45.582743808 +0100
+@@ -934,7 +934,7 @@
+                         ogg_uint32_t SBRows,
+                         ogg_uint32_t SBCols){
+ 
+-  ogg_int32_t   FragIndex;  /* Fragment number */
++  ogg_int32_t   FragIndex, FirstFragIndex;  /* Fragment number */
+   ogg_uint32_t  MB, B;      /* Macro-Block, Block indices */
+   ogg_uint32_t  SBrow;      /* Super-Block row number */
+   ogg_uint32_t  SBcol;      /* Super-Block row number */
+@@ -953,19 +953,20 @@
+         /* There may be MB's lying out of frame which must be
+            ignored. For these MB's Top left block will have a negative
+            Fragment Index. */
+-        if ( QuadMapToMBTopLeft(cpi->pb.BlockMap,SB,MB) >= 0 ) {
++        if ( (FirstFragIndex = QuadMapToMBTopLeft(cpi->pb.BlockMap,SB,MB)) >= 0 ) {
+ 
+           cpi->MBCodingMode = CODE_INTRA;
+ 
+           /* Now actually code the blocks. */
+           for ( B=0; B<4; B++ ) {
+             FragIndex = QuadMapToIndex1( cpi->pb.BlockMap, SB, MB, B );
+-            cpi->pb.FragCodingMethod[FragIndex] = cpi->MBCodingMode;
++            if (FragIndex >= 0)
++	      cpi->pb.FragCodingMethod[FragIndex] = cpi->MBCodingMode;
+           }
+ 
+           /* Matching fragments in the U and V planes */
+-          UVRow = (FragIndex / (cpi->pb.HFragments * 2));
+-          UVColumn = (FragIndex % cpi->pb.HFragments) / 2;
++          UVRow = (FirstFragIndex / (cpi->pb.HFragments * 2));
++          UVColumn = (FirstFragIndex % cpi->pb.HFragments) / 2;
+           UVFragOffset = (UVRow * (cpi->pb.HFragments / 2)) + UVColumn;
+ 
+           cpi->pb.FragCodingMethod[cpi->pb.YPlaneFragments + UVFragOffset] =
+Only in lib/enc: encode.c.orig
+diff -ru lib/enc.orig/misc_common.c lib/enc/misc_common.c
+--- lib/enc.orig/misc_common.c	2009-02-25 00:37:51.865139234 +0100
++++ lib/enc/misc_common.c	2009-02-25 00:51:20.362286530 +0100
+@@ -87,14 +87,14 @@
+   if ( QuadMapToMBTopLeft(cpi->pb.BlockMap, SB, MB ) >= 0 ) {
+     /* Up regulate the component blocks Y then UV. */
+     for ( B=0; B<4; B++ ){
+-      FragIndex = QuadMapToIndex1( cpi->pb.BlockMap, SB, MB, B );
+-
+-      if ( ( !cpi->pb.display_fragments[FragIndex] ) &&
+-           ( (NoCheck) || (cpi->FragmentLastQ[FragIndex] > RegulationQ) ) ){
+-        cpi->pb.display_fragments[FragIndex] = 1;
+-        cpi->extra_fragments[FragIndex] = 1;
+-        cpi->FragmentLastQ[FragIndex] = RegulationQ;
+-        cpi->MotionScore++;
++      if ((FragIndex = QuadMapToIndex1( cpi->pb.BlockMap, SB, MB, B )) >= 0) {
++        if ( ( !cpi->pb.display_fragments[FragIndex] ) &&
++             ( (NoCheck) || (cpi->FragmentLastQ[FragIndex] > RegulationQ) ) ){
++          cpi->pb.display_fragments[FragIndex] = 1;
++          cpi->extra_fragments[FragIndex] = 1;
++          cpi->FragmentLastQ[FragIndex] = RegulationQ;
++          cpi->MotionScore++;
++        }
+       }
+     }
+ 
diff --git a/multimedia/libtheora/pkg-plist b/multimedia/libtheora/pkg-plist
index 18e40a68918d..3f6920eda264 100644
--- a/multimedia/libtheora/pkg-plist
+++ b/multimedia/libtheora/pkg-plist
@@ -1,7 +1,20 @@
 include/theora/theora.h
+include/theora/codec.h
+include/theora/theoraenc.h
+include/theora/theoradec.h
 lib/libtheora.a
 lib/libtheora.la
 lib/libtheora.so
 lib/libtheora.so.0
+lib/libtheoraenc.a
+lib/libtheoraenc.la
+lib/libtheoraenc.so
+lib/libtheoraenc.so.1
+lib/libtheoradec.a
+lib/libtheoradec.la
+lib/libtheoradec.so
+lib/libtheoradec.so.1
 libdata/pkgconfig/theora.pc
+libdata/pkgconfig/theoraenc.pc
+libdata/pkgconfig/theoradec.pc
 @dirrm include/theora