update to 1.1.1, from Brad, maintainer timeout

This commit is contained in:
sthen 2009-12-13 22:01:32 +00:00
parent 8ddafd0039
commit a95cdc49cd
7 changed files with 77 additions and 63 deletions

View File

@ -1,15 +1,15 @@
# $OpenBSD: Makefile,v 1.10 2009/02/12 03:21:56 sthen Exp $
# $OpenBSD: Makefile,v 1.11 2009/12/13 22:01:32 sthen Exp $
COMMENT= open video codec
DISTNAME= libtheora-1.0
DISTNAME= libtheora-1.1.1
CATEGORIES= multimedia
MASTER_SITES= http://downloads.xiph.org/releases/theora/
EXTRACT_SUFX= .tar.bz2
SHARED_LIBS+= theora 3.1
SHARED_LIBS+= theoradec 1.0
SHARED_LIBS+= theoraenc 1.1
SHARED_LIBS= theora 3.2 \
theoradec 1.1 \
theoraenc 1.2
HOMEPAGE= http://www.theora.org/
@ -26,9 +26,10 @@ LIB_DEPENDS= ogg.>=5::audio/libogg
USE_LIBTOOL= Yes
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --disable-examples
CONFIGURE_ENV= ac_cv_prog_HAVE_DOXYGEN=false \
ac_cv_prog_HAVE_PDFLATEX=false
CONFIGURE_STYLE= autoconf
# Should be 2.63
AUTOCONF_VERSION= 2.61
CONFIGURE_ARGS= --disable-asm --disable-examples --disable-spec
CONFIGURE_ENV= ac_cv_prog_HAVE_DOXYGEN=false
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (libtheora-1.0.tar.bz2) = yWOTcFP0Wnh4lUvtN86xgg==
RMD160 (libtheora-1.0.tar.bz2) = 9y0KLOhHWoiKtn/Xe3Em1m1TfJs=
SHA1 (libtheora-1.0.tar.bz2) = AnF3cwAbRPlbxsIxEaiUk6SpP4c=
SHA256 (libtheora-1.0.tar.bz2) = OunfVuj8df/ibmOhPK4s550HlBYXX7C6/+Di3o3JGm0=
SIZE (libtheora-1.0.tar.bz2) = 1652987
MD5 (libtheora-1.1.1.tar.bz2) = KSq2XO3VAh1rfd0RfgfNjg==
RMD160 (libtheora-1.1.1.tar.bz2) = HQcjS9fiKWxh1uMP6YFkFap/2OU=
SHA1 (libtheora-1.1.1.tar.bz2) = jcqo5hzYbrEkRGfAtkud2sBK4mI=
SHA256 (libtheora-1.1.1.tar.bz2) = tq4e4vo9QqxIkofT7DTFiFcwsSlvCAGuV3o1GT06/7w=
SIZE (libtheora-1.1.1.tar.bz2) = 1903175

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-configure,v 1.4 2008/07/25 14:20:50 brad Exp $
--- configure.orig Thu Jul 24 13:22:04 2008
+++ configure Thu Jul 24 13:23:06 2008
@@ -19970,8 +19970,8 @@ else
case $host in
*)
DEBUG="-g -Wall -Wno-parentheses -DDEBUG -D__NO_MATH_INLINES"
- CFLAGS="-Wall -Wno-parentheses -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
- PROFILE="-Wall -Wno-parentheses -pg -g -O3 -fno-inline-functions -DDEBUG";;
+ CFLAGS="-Wall -Wno-parentheses -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
+ PROFILE="-Wall -Wno-parentheses -pg -g -fno-inline-functions -DDEBUG";;
esac
fi
CFLAGS="$CFLAGS $cflags_save"

View File

@ -0,0 +1,24 @@
$OpenBSD: patch-configure_ac,v 1.1 2009/12/13 22:01:32 sthen Exp $
--- configure.ac.orig Sat Aug 22 13:54:35 2009
+++ configure.ac Thu Aug 27 23:43:00 2009
@@ -168,8 +168,8 @@ else
case $host in
*)
DEBUG="-g -Wall -Wno-parentheses -DDEBUG -D__NO_MATH_INLINES"
- CFLAGS="-Wall -Wno-parentheses -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
- PROFILE="-Wall -Wno-parentheses -pg -g -O3 -fno-inline-functions -DDEBUG";;
+ CFLAGS="-Wall -Wno-parentheses -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
+ PROFILE="-Wall -Wno-parentheses -pg -g -fno-inline-functions -DDEBUG";;
esac
fi
CFLAGS="$CFLAGS $cflags_save"
@@ -426,7 +426,8 @@ dnl Check for library functions
dnl --------------------------------------------------
dnl OpenBSD needs -lcompat for ftime() used by dump_video.c
-AC_SEARCH_LIBS([ftime], [compat])
+AC_CHECK_LIB([compat], [ftime], [COMPAT_LIBS='-lcompat'])
+AC_SUBST(COMPAT_LIBS)
dnl substitute the included getopt if the system doesn't support long options
AC_CHECK_FUNC(getopt_long,

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-doc_Makefile_in,v 1.3 2008/07/25 14:20:18 brad Exp $
--- doc/Makefile.in.orig Wed Apr 16 16:26:14 2008
+++ doc/Makefile.in Tue Jul 15 16:54:48 2008
@@ -187,7 +187,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
$OpenBSD: patch-doc_Makefile_in,v 1.4 2009/12/13 22:01:32 sthen Exp $
--- doc/Makefile.in.orig Wed Aug 12 11:58:08 2009
+++ doc/Makefile.in Wed Aug 12 21:44:27 2009
@@ -161,7 +161,7 @@ sys_symbol_underscore = @sys_symbol_underscore@
SUBDIRS = spec
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+docdir = $(datadir)/doc/$(PACKAGE)
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
static_docs = vp3-format.txt color.html \
draft-ietf-avt-rtp-theora-00.xml \

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-doc_spec_Makefile_in,v 1.1 2008/07/25 14:20:50 brad Exp $
--- doc/spec/Makefile.in.orig Tue Jul 15 17:48:31 2008
+++ doc/spec/Makefile.in Tue Jul 15 17:48:40 2008
@@ -197,7 +197,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
$OpenBSD: patch-doc_spec_Makefile_in,v 1.2 2009/12/13 22:01:32 sthen Exp $
--- doc/spec/Makefile.in.orig Wed Aug 12 11:58:08 2009
+++ doc/spec/Makefile.in Wed Aug 12 21:47:07 2009
@@ -162,7 +162,7 @@ ltdl_LIBOBJS = @ltdl_LIBOBJS@
ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
sys_symbol_underscore = @sys_symbol_underscore@
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+docdir = $(datadir)/doc/$(PACKAGE)
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
built_docs = Theora.pdf

View File

@ -1,17 +1,20 @@
$OpenBSD: patch-examples_Makefile_in,v 1.3 2008/07/25 14:20:18 brad Exp $
--- examples/Makefile.in.orig Wed Apr 16 16:26:15 2008
+++ examples/Makefile.in Tue Jul 15 17:08:10 2008
@@ -251,11 +251,11 @@ LDADD = ../lib/libtheora.la $(OGG_LIBS)
LDADDENC = ../lib/libtheoraenc.la ../lib/libtheoradec.la $(OGG_LIBS)
$OpenBSD: patch-examples_Makefile_in,v 1.4 2009/12/13 22:01:32 sthen Exp $
--- examples/Makefile.in.orig Sat Aug 22 14:17:18 2009
+++ examples/Makefile.in Thu Aug 27 23:29:13 2009
@@ -75,6 +75,7 @@ BUILDABLE_EXAMPLES = @BUILDABLE_EXAMPLES@
CAIRO_CFLAGS = @CAIRO_CFLAGS@
CAIRO_LIBS = @CAIRO_LIBS@
CC = @CC@
+COMPAT_LIBS = @COMPAT_LIBS@
CPP = @CPP@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -173,7 +174,7 @@ LDADDENC = ../lib/libtheoraenc.la ../lib/libtheoradec.
dump_video_SOURCES = dump_video.c
EXTRA_dump_video_SOURCES = getopt.c getopt1.c getopt.h
-dump_video_LDADD = $(GETOPT_OBJS) $(LDADD)
+dump_video_LDADD = $(GETOPT_OBJS) $(LDADD) -lcompat
dump_video_DEPENDENCIES = $(GETOPT_OBJS)
player_example_SOURCES = player_example.c
player_example_CFLAGS = $(SDL_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS)
-player_example_LDADD = $(LDADD) $(SDL_LIBS) $(VORBIS_LIBS)
+player_example_LDADD = $(LDADD) $(SDL_LIBS) $(VORBIS_LIBS) -lossaudio
encoder_example_SOURCES = encoder_example.c
EXTRA_encoder_example_SOURCES = getopt.c getopt1.c getopt.h
encoder_example_CFLAGS = $(OGG_CFLAGS) $(VORBIS_CFLAGS)
-dump_video_LDADD = $(GETOPT_OBJS) $(LDADDDEC)
+dump_video_LDADD = $(GETOPT_OBJS) $(LDADDDEC) $(COMPAT_LIBS)
dump_psnr_SOURCES = dump_psnr.c
EXTRA_dump_psnr_SOURCES = getopt.c getopt1.c getopt.h