Date: Fri, 27 Nov 2009 11:33:34 +0800 (CST) From: Gea-Suan Lin <gslin@gslin.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: gslin@gslin.org, multimedia@FreeBSD.org Subject: ports/140919: [PATCH] multimedia/libtheora: update to 1.1.1 Message-ID: <20091127033334.968757E81B@colo-p.gslin.org> Resent-Message-ID: <200911270340.nAR3e4se068436@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 140919 >Category: ports >Synopsis: [PATCH] multimedia/libtheora: update to 1.1.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Nov 27 03:40:03 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Gea-Suan Lin >Release: FreeBSD 7.2-RELEASE-p3 i386 >Organization: >Environment: System: FreeBSD colo-p.gslin.org 7.2-RELEASE-p3 FreeBSD 7.2-RELEASE-p3 #0: Sat Aug 22 10:48:39 CST 2009 >Description: - Update to 1.1.1 Removed file(s): - files/patch-issue1515 Port maintainer (multimedia@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- libtheora-1.1.1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/multimedia/libtheora/Makefile /home/staff/gslin/work/ports/libtheora/Makefile --- /usr/ports/multimedia/libtheora/Makefile 2009-08-03 03:34:50.000000000 +0800 +++ /home/staff/gslin/work/ports/libtheora/Makefile 2009-11-27 11:31:49.000000000 +0800 @@ -6,8 +6,7 @@ # PORTNAME= libtheora -PORTVERSION= 1.0 -PORTREVISION= 1 +PORTVERSION= 1.1.1 CATEGORIES= multimedia MASTER_SITES= http://downloads.xiph.org/releases/theora/ \ http://distfiles.master.finkmirrors.net/ @@ -15,7 +14,8 @@ MAINTAINER= multimedia@FreeBSD.org COMMENT= Theora video codec for the Ogg multimedia streaming system -LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis +LIB_DEPENDS= ogg:${PORTSDIR}/audio/libogg \ + vorbis:${PORTSDIR}/audio/libvorbis USE_BZIP2= yes USE_LDCONFIG= yes @@ -29,8 +29,14 @@ --enable-shared \ --disable-examples +.include <bsd.port.pre.mk> + +.if ${ARCH} != "i386" +CONFIGURE_ARGS+= --disable-asm +.endif + 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> +.include <bsd.port.post.mk> diff -ruN --exclude=CVS /usr/ports/multimedia/libtheora/distinfo /home/staff/gslin/work/ports/libtheora/distinfo --- /usr/ports/multimedia/libtheora/distinfo 2009-03-31 06:10:53.000000000 +0800 +++ /home/staff/gslin/work/ports/libtheora/distinfo 2009-11-27 11:22:57.000000000 +0800 @@ -1,3 +1,3 @@ -MD5 (libtheora-1.0.tar.bz2) = c963937053f45a7878954bed37ceb182 -SHA256 (libtheora-1.0.tar.bz2) = 3ae9df56e8fc75ffe26e63a13cae2ce79d079416175fb0baffe0e2de8dc91a6d -SIZE (libtheora-1.0.tar.bz2) = 1652987 +MD5 (libtheora-1.1.1.tar.bz2) = 292ab65cedd5021d6b7ddd117e07cd8e +SHA256 (libtheora-1.1.1.tar.bz2) = b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc +SIZE (libtheora-1.1.1.tar.bz2) = 1903175 diff -ruN --exclude=CVS /usr/ports/multimedia/libtheora/files/patch-Makefile.in /home/staff/gslin/work/ports/libtheora/files/patch-Makefile.in --- /usr/ports/multimedia/libtheora/files/patch-Makefile.in 2009-03-31 06:10:53.000000000 +0800 +++ /home/staff/gslin/work/ports/libtheora/files/patch-Makefile.in 2009-11-27 11:25:45.000000000 +0800 @@ -1,20 +1,20 @@ ---- 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 -+DIST_SUBDIRS = lib include m4 - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) -@@ -274,7 +274,7 @@ - libtheora.spec libtheora.spec.in \ +--- Makefile.in.orig 2009-11-27 11:25:03.000000000 +0800 ++++ Makefile.in 2009-11-27 11:25:30.000000000 +0800 +@@ -177,7 +177,7 @@ theora-uninstalled.pc.in + -pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(prefix)/libdata/pkgconfig ++pkgconfigdir = $(libdir)/libdata/pkgconfig pkgconfig_DATA = theora.pc theoradec.pc theoraenc.pc + subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -200,7 +200,7 @@ + missing mkinstalldirs theora-uninstalled.pc.in theora.pc.in \ + theoradec-uninstalled.pc.in theoradec.pc.in \ + theoraenc-uninstalled.pc.in theoraenc.pc.in +-DIST_SUBDIRS = lib include doc tests m4 examples ++DIST_SUBDIRS = lib include m4 all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive + diff -ruN --exclude=CVS /usr/ports/multimedia/libtheora/files/patch-issue1515 /home/staff/gslin/work/ports/libtheora/files/patch-issue1515 --- /usr/ports/multimedia/libtheora/files/patch-issue1515 2009-03-31 06:10:53.000000000 +0800 +++ /home/staff/gslin/work/ports/libtheora/files/patch-issue1515 1970-01-01 08:00:00.000000000 +0800 @@ -1,64 +0,0 @@ -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 -ruN --exclude=CVS /usr/ports/multimedia/libtheora/pkg-plist /home/staff/gslin/work/ports/libtheora/pkg-plist --- /usr/ports/multimedia/libtheora/pkg-plist 2009-03-31 06:10:53.000000000 +0800 +++ /home/staff/gslin/work/ports/libtheora/pkg-plist 2009-11-27 11:28:28.000000000 +0800 @@ -1,20 +1,23 @@ -include/theora/theora.h +@comment $FreeBSD$ include/theora/codec.h -include/theora/theoraenc.h +include/theora/theora.h include/theora/theoradec.h +include/theora/theoraenc.h +lib/libdata/pkgconfig/theora.pc +lib/libdata/pkgconfig/theoradec.pc +lib/libdata/pkgconfig/theoraenc.pc 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 +lib/libtheoraenc.a +lib/libtheoraenc.la +lib/libtheoraenc.so +lib/libtheoraenc.so.1 +@dirrmtry lib/libdata/pkgconfig +@dirrmtry lib/libdata +@dirrmtry include/theora --- libtheora-1.1.1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20091127033334.968757E81B>