cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update ffmpeg to snapshot 20050130

Browse Source 
- remove inter-library dependencies
- chase fallout in dependent ports

From: Jacob Meuser <jakemsr@jakemsr.com>
This commit is contained in:
naddy 2005-02-09 23:41:42 +00:00
parent 7b14e51021
commit d17cf576bc
18 changed files with 181 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
graphics/ffmpeg/Makefile
View File

@ -1,13 +1,16 @@
# $OpenBSD: Makefile,v 1.14 2005/01/16 22:53:17 alek Exp $
# $OpenBSD: Makefile,v 1.15 2005/02/09 23:41:42 naddy Exp $
COMMENT= "audio/video converter and streamer with bktr(4) support"
DISTNAME= ffmpeg-0.4.9-pre1
PKGNAME= ${DISTNAME:S/9-p/9p/}p0
SV= 4.9
CATEGORIES= graphics x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ffmpeg/}
DISTNAME= FFMpeg-20050130
PKGNAME= ${DISTNAME:L}
HOMEPAGE= http://ffmpeg.sourceforge.net/
CATEGORIES= graphics x11
MASTER_SITES= http://www.jakemsr.com/
# http://mplayerhq.hu/MPlayer/cvs/
EXTRACT_SUFX= .tar.bz2
HOMEPAGE= http://www.ffmpeg.org/
MAINTAINER= Jacob Meuser <jakemsr@jakemsr.com>
@ -20,6 +23,7 @@ WANTLIB= X11 Xext c m ogg ossaudio pthread usbhid z
BUILD_DEPENDS= ::textproc/texi2html
LIB_DEPENDS= SDL.2.0::devel/sdl \
a52.0.0::audio/liba52 \
mp3lame.0.1::audio/lame \
vorbis.3.0,vorbisenc.2.0::audio/libvorbis
@ -40,6 +44,7 @@ CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--extra-cflags="-I${LOCALBASE}/include" \
--extra-ldflags="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
--disable-opts \
--enable-a52 \
--enable-pp \
--enable-mp3lame \
--enable-vorbis \
@ -49,17 +54,18 @@ CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
MAKE_ENV+= LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
# shared libpostproc
.if ${MACHINE_ARCH} != "m88k" && ${MACHINE_ARCH} != "vax"
CONFIGURE_ARGS+=--enable-shared-pp
.endif
# bktr(4) support
.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "powerpc"
CONFIGURE_ARGS+=--disable-v4l
.endif
.if ${MACHINE_ARCH} != "m88k" && ${MACHINE_ARCH} != "vax"
CONFIGURE_ARGS+=--enable-a52bin
RUN_DEPENDS= ::audio/liba52
.else
CONFIGURE_ARGS+=--enable-a52
.endif
# version numbers for the shared libraries
SV= 5.0
post-extract:
@cp ${FILESDIR}/grab_bsdbktr.c ${WRKSRC}/libavformat/
@ -76,7 +82,7 @@ do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/ffserver ${PREFIX}/bin/ffserver
${INSTALL_DATA_DIR} ${PREFIX}/include/ffmpeg
${INSTALL_DATA_DIR} ${PREFIX}/include/postproc
${INSTALL_DATA} ${WRKSRC}/libavcodec/{avcodec,common,rational}.h \
${INSTALL_DATA} ${WRKSRC}/libavcodec/{avcodec,common,rational,mpegaudio}.h \
${PREFIX}/include/ffmpeg
${INSTALL_DATA} ${WRKSRC}/libavformat/{avformat.h,avio.h,rtp.h,rtsp.h,rtspcodes.h} \
${PREFIX}/include/ffmpeg
@ -86,9 +92,13 @@ do-install:
${WRKBUILD}/libavformat/libavformat.a ${PREFIX}/lib
.if ${MACHINE_ARCH} != "m88k" && ${MACHINE_ARCH} != "vax"
${INSTALL_DATA} ${WRKBUILD}/libavcodec/libavcodec.so.${SV} \
${PREFIX}/lib/libavcodec.so.${SV}
${INSTALL_DATA} ${WRKBUILD}/libavformat/libavformat.so.${SV} \
${PREFIX}/lib/libavformat.so.${SV}
${WRKBUILD}/libavformat/libavformat.so.${SV} \
${WRKBUILD}/libavcodec/libpostproc/libpostproc.so.${SV} \
${PREFIX}/lib
.else
${INSTALL_DATA} ${WRKBUILD}/libavcodec/libpostproc/libpostproc.a \
${PREFIX}/lib
.endif
.include <bsd.port.mk>

8
graphics/ffmpeg/distinfo
View File

@ -1,4 +1,4 @@
MD5 (ffmpeg-0.4.9-pre1.tar.gz) = ea5587e3c66d50b1503b82ac4179c303
RMD160 (ffmpeg-0.4.9-pre1.tar.gz) = fd682846f97ada32951af7844e185c42783189a4
SHA1 (ffmpeg-0.4.9-pre1.tar.gz) = aad00445137520bec19e56bcb042e75a10c53bb3
SIZE (ffmpeg-0.4.9-pre1.tar.gz) = 1611332
MD5 (FFMpeg-20050130.tar.bz2) = 07e6fb2a05a597472c7821d2384d937f
RMD160 (FFMpeg-20050130.tar.bz2) = 8022ac61cf7047f63cf6d9df8ab24c07b42729cc
SHA1 (FFMpeg-20050130.tar.bz2) = e35822d7c83560c44790e71832fa280a92c57333
SIZE (FFMpeg-20050130.tar.bz2) = 1492188

19
graphics/ffmpeg/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.3 2004/10/13 01:38:21 jolan Exp $
--- Makefile.orig Thu Jul 8 04:02:04 2004
+++ Makefile Wed Oct 6 20:58:34 2004
$OpenBSD: patch-Makefile,v 1.4 2005/02/09 23:41:42 naddy Exp $
--- Makefile.orig Fri Jan 21 14:16:04 2005
+++ Makefile Sun Jan 30 18:49:14 2005
@@ -7,7 +7,7 @@ include config.mak
VPATH=$(SRC_PATH)
@ -10,15 +10,24 @@ $OpenBSD: patch-Makefile,v 1.3 2004/10/13 01:38:21 jolan Exp $
ifeq ($(TARGET_GPROF),yes)
CFLAGS+=-p
@@ -37,9 +37,10 @@ ifeq ($(BUILD_SHARED),yes)
@@ -38,13 +38,18 @@ ifeq ($(BUILD_SHARED),yes)
DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF)
else
DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
+endif
+
+ifeq ($(CONFIG_AC3),yes)
+EXTRALIBS+=-la52
+endif
+
ifeq ($(CONFIG_MP3LAME),yes)
EXTRALIBS+=-lmp3lame
-endif
endif
-endif
ifeq ($(CONFIG_VORBIS),yes)
-EXTRALIBS+=-lvorbis -lvorbisenc -logg
+EXTRALIBS+=-lvorbisenc -lvorbis -logg
endif
ifeq ($(CONFIG_FAAD),yes)

37
graphics/ffmpeg/patches/patch-configure
View File

@ -1,43 +1,26 @@
$OpenBSD: patch-configure,v 1.8 2004/10/13 01:38:21 jolan Exp $
--- configure.orig Mon Jul 5 11:06:16 2004
+++ configure Fri Oct 8 17:42:35 2004
@@ -232,6 +232,12 @@ make="gmake"
$OpenBSD: patch-configure,v 1.9 2005/02/09 23:41:42 naddy Exp $
--- configure.orig Fri Jan 21 14:16:04 2005
+++ configure Tue Feb 8 17:03:22 2005
@@ -248,6 +248,12 @@ make="gmake"
CFLAGS="-pthread"
LDFLAGS="$LDFLAGS -export-dynamic -pthread"
;;
+OpenBSD)
+strip="echo"
+extralibs="$extralibs -lossaudio"
+extralibs="$extralibs -lossaudio -pthread"
+source_path="`echo $0 | sed -e 's#/configure##'`"
+SLIBSUF=.so`grep '#define FFMPEG_VERSION ' $source_path/libavcodec/avcodec.h | cut -d '"' -f 2 | cut -d '0' -f 2 | cut -d '-' -f 1`
+SLIBSUF=.so.5.0
+;;
BSD/OS)
v4l="no"
audio_oss="yes"
@@ -347,9 +353,9 @@ for opt do
;;
--make=*) make=`echo $opt | cut -d '=' -f 2`
;;
- --extra-cflags=*) CFLAGS="${opt#--extra-cflags=}"
+ --extra-cflags=*) CFLAGS="$CFLAGS ${opt#--extra-cflags=}"
;;
- --extra-ldflags=*) LDFLAGS=${opt#--extra-ldflags=}
+ --extra-ldflags=*) LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
;;
--extra-libs=*) extralibs=${opt#--extra-libs=}
;;
@@ -1122,8 +1128,12 @@ fi
if test "$pthreads" = "yes" ; then
@@ -1219,9 +1225,6 @@ if test "$pthreads" = "yes" ; then
echo "HAVE_PTHREADS=yes" >> config.mak
echo "#define HAVE_PTHREADS 1" >> $TMPH
echo "#define HAVE_THREADS 1" >> $TMPH
- if test $targetos != FreeBSD; then
- extralibs="$extralibs -lpthread"
+ if test $targetos = OpenBSD; then
+ extralibs="$extralibs -pthread"
+ else
+ if test $targetos != FreeBSD; then
+ extralibs="$extralibs -lpthread"
+ fi
fi
- fi
fi
if test "$sdl" = "yes" ; then
echo "CONFIG_SDL=yes" >> config.mak

33
graphics/ffmpeg/patches/patch-libavcodec_Makefile
View File

@ -1,7 +1,23 @@
$OpenBSD: patch-libavcodec_Makefile,v 1.8 2004/10/13 01:38:21 jolan Exp $
--- libavcodec/Makefile.orig Fri Jun 18 06:11:15 2004
+++ libavcodec/Makefile Wed Oct 6 20:30:07 2004
@@ -177,6 +177,7 @@ OBJS := $(OBJS) $(ASM_OBJS)
$OpenBSD: patch-libavcodec_Makefile,v 1.9 2005/02/09 23:41:43 naddy Exp $
--- libavcodec/Makefile.orig Sat Jan 22 09:52:00 2005
+++ libavcodec/Makefile Tue Feb 8 17:03:22 2005
@@ -76,11 +76,11 @@ ifeq ($(CONFIG_AC3),yes)
OBJS+= a52dec.o
# using builtin liba52 or runtime linked liba52.so.0
-ifneq ($(CONFIG_A52BIN),yes)
-OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \
- liba52/imdct.o liba52/parse.o liba52/crc.o liba52/resample.o
+#ifneq ($(CONFIG_A52BIN),yes)
+#OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \
+# liba52/imdct.o liba52/parse.o liba52/crc.o liba52/resample.o
+#endif
endif
-endif
# currently using libdts for dts decoding
ifeq ($(CONFIG_DTS),yes)
@@ -199,6 +199,7 @@ OBJS := $(OBJS) $(ASM_OBJS)
LIB= $(LIBPREF)avcodec$(LIBSUF)
ifeq ($(BUILD_SHARED),yes)
SLIB= $(SLIBPREF)avcodec$(SLIBSUF)
@ -9,3 +25,12 @@ $OpenBSD: patch-libavcodec_Makefile,v 1.8 2004/10/13 01:38:21 jolan Exp $
endif
TESTS= imgresample-test dct-test motion-test fft-test
@@ -222,7 +223,7 @@ ifeq ($(CONFIG_WIN32),yes)
$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
-lib /machine:i386 /def:$(@:.dll=.def)
else
- $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS)
+ $(CC) $(SHFLAGS) -o $@ $(OBJS) $(AMREXTRALIBS) $(LDFLAGS)
endif
dsputil.o: dsputil.c dsputil.h

21
graphics/ffmpeg/patches/patch-libavcodec_lcl_c
View File

@ -1,30 +1,21 @@
$OpenBSD: patch-libavcodec_lcl_c,v 1.1 2004/10/13 01:38:21 jolan Exp $
--- libavcodec/lcl.c.orig Tue Jan 13 12:26:44 2004
+++ libavcodec/lcl.c Wed Oct 6 21:22:41 2004
@@ -287,7 +287,7 @@ static int decode_frame(AVCodecContext *
$OpenBSD: patch-libavcodec_lcl_c,v 1.2 2005/02/09 23:41:43 naddy Exp $
--- libavcodec/lcl.c.orig Sun Jan 23 10:09:06 2005
+++ libavcodec/lcl.c Fri Jan 28 00:15:49 2005
@@ -297,7 +297,7 @@ static int decode_frame(AVCodecContext *
return -1;
}
if (mthread_outlen != (unsigned int)(c->zstream.total_out)) {
- av_log(avctx, AV_LOG_ERROR, "Mthread1 decoded size differs (%u != %lu)\n",
+ av_log(avctx, AV_LOG_ERROR, "Mthread1 decoded size differs (%u != %lld)\n",
mthread_outlen, c->zstream.total_out);
}
zret = inflateReset(&(c->zstream));
@@ -305,7 +305,7 @@ static int decode_frame(AVCodecContext *
return -1;
}
if ((c->decomp_size - mthread_outlen) != (unsigned int)(c->zstream.total_out)) {
- av_log(avctx, AV_LOG_ERROR, "Mthread2 decoded size differs (%d != %lu)\n",
+ av_log(avctx, AV_LOG_ERROR, "Mthread2 decoded size differs (%d != %lld)\n",
c->decomp_size - mthread_outlen, c->zstream.total_out);
}
} else {
@@ -319,7 +319,7 @@ static int decode_frame(AVCodecContext *
@@ -331,7 +331,7 @@ static int decode_frame(AVCodecContext *
return -1;
}
if (c->decomp_size != (unsigned int)(c->zstream.total_out)) {
- av_log(avctx, AV_LOG_ERROR, "Decoded size differs (%d != %lu)\n",
+ av_log(avctx, AV_LOG_ERROR, "Decoded size differs (%d != %lld)\n",
c->decomp_size, c->zstream.total_out);
return -1;
}
}

13
graphics/ffmpeg/patches/patch-libavcodec_libpostproc_Makefile Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-libavcodec_libpostproc_Makefile,v 1.1 2005/02/09 23:41:43 naddy Exp $
--- libavcodec/libpostproc/Makefile.orig Tue Feb 8 17:10:14 2005
+++ libavcodec/libpostproc/Makefile Tue Feb 8 17:11:03 2005
@@ -38,8 +38,7 @@ postprocess_pic.o: postprocess.c
$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<
$(SPPLIB): $(SPPOBJS)
- $(CC) -shared -Wl,-soname,$(SPPLIB).0 \
- -o $(SPPLIB) $(SPPOBJS)
+ $(CC) -shared -o $(SPPLIB) $(SPPOBJS)
endif
$(PPLIB): $(PPOBJS)

8
graphics/ffmpeg/patches/patch-libavcodec_mpeg12_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libavcodec_mpeg12_c,v 1.1 2004/10/13 01:38:21 jolan Exp $
--- libavcodec/mpeg12.c.orig Wed Jun 30 16:12:21 2004
+++ libavcodec/mpeg12.c Wed Oct 6 20:43:36 2004
@@ -2828,7 +2828,7 @@ static int mpeg_decode_frame(AVCodecCont
$OpenBSD: patch-libavcodec_mpeg12_c,v 1.2 2005/02/09 23:41:43 naddy Exp $
--- libavcodec/mpeg12.c.orig Mon Dec 13 22:56:26 2004
+++ libavcodec/mpeg12.c Sun Jan 16 21:01:36 2005
@@ -2997,7 +2997,7 @@ static int mpeg_decode_frame(AVCodecCont
input_size = buf_end - buf_ptr;
if(avctx->debug & FF_DEBUG_STARTCODE){

21
graphics/ffmpeg/patches/patch-libavformat_Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libavformat_Makefile,v 1.7 2004/10/07 06:12:11 jolan Exp $
--- libavformat/Makefile.orig Sat Apr 24 10:16:23 2004
+++ libavformat/Makefile Thu Oct 7 00:17:28 2004
@@ -40,7 +40,7 @@ OBJS+= avio.o aviobuf.o file.o
$OpenBSD: patch-libavformat_Makefile,v 1.8 2005/02/09 23:41:43 naddy Exp $
--- libavformat/Makefile.orig Tue Jan 11 00:16:04 2005
+++ libavformat/Makefile Tue Feb 8 17:03:23 2005
@@ -42,7 +42,7 @@ OBJS+= avio.o aviobuf.o file.o
OBJS+= framehook.o
ifeq ($(CONFIG_VIDEO4LINUX),yes)
@ -10,11 +10,20 @@ $OpenBSD: patch-libavformat_Makefile,v 1.7 2004/10/07 06:12:11 jolan Exp $
endif
ifeq ($(CONFIG_DV1394),yes)
@@ -77,6 +77,7 @@ endif
@@ -83,6 +83,7 @@ endif
LIB= $(LIBPREF)avformat$(LIBSUF)
ifeq ($(BUILD_SHARED),yes)
SLIB= $(SLIBPREF)avformat$(SLIBSUF)
+CFLAGS += ${PIC} -DPIC
endif
SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp)
EXTRALIBS+=-lavcodec -L../libavcodec
@@ -104,7 +105,7 @@ ifeq ($(CONFIG_WIN32),yes)
$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll
-lib /machine:i386 /def:$(@:.dll=.def)
else
- $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS)
+ $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(LDFLAGS)
endif
depend: $(SRCS)

8
graphics/ffmpeg/patches/patch-vhook_ppm_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-vhook_ppm_c,v 1.1 2004/10/07 06:12:11 jolan Exp $
--- vhook/ppm.c.orig Sun Sep 28 15:58:57 2003
+++ vhook/ppm.c Thu Oct 7 00:46:12 2004
@@ -73,7 +73,7 @@ rwpipe *rwpipe_open( int argc, char *arg
$OpenBSD: patch-vhook_ppm_c,v 1.2 2005/02/09 23:41:43 naddy Exp $
--- vhook/ppm.c.orig Wed Jan 12 20:48:23 2005
+++ vhook/ppm.c Sun Jan 16 21:01:36 2005
@@ -74,7 +74,7 @@ rwpipe *rwpipe_open( int argc, char *arg
close( output[ 0 ] );
close( output[ 1 ] );

2
graphics/ffmpeg/pkg/DESCR
View File

@ -1,7 +1,7 @@
FFmpeg is a complete solution to record, convert and stream audio and
video. It includes libavcodec, the leading audio/video codec library.
bktr(4) support (i386/powerpc only) may be controlled through the
bktr(4) support (amd64/i386/powerpc only) may be controlled through the
following environment variables:
BKTR_DEV={0|1|2|3|4}: Selects device input (tuner, camera, ...)

7
graphics/ffmpeg/pkg/PFRAG.shared
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.9 2004/10/07 06:12:11 jolan Exp $
@lib lib/libavcodec.so.4.9
@lib lib/libavformat.so.4.9
@comment $OpenBSD: PFRAG.shared,v 1.10 2005/02/09 23:41:43 naddy Exp $
@lib lib/libavcodec.so.5.0
@lib lib/libavformat.so.5.0
@lib lib/libpostproc.so.5.0

3
graphics/ffmpeg/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2004/10/13 01:38:21 jolan Exp $
@comment $OpenBSD: PLIST,v 1.8 2005/02/09 23:41:43 naddy Exp $
%%SHARED%%
bin/ffmpeg
bin/ffplay
@ -8,6 +8,7 @@ include/ffmpeg/avcodec.h
include/ffmpeg/avformat.h
include/ffmpeg/avio.h
include/ffmpeg/common.h
include/ffmpeg/mpegaudio.h
include/ffmpeg/rational.h
include/ffmpeg/rtp.h
include/ffmpeg/rtsp.h

9
multimedia/libquicktime/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.2 2004/12/04 21:44:34 sturm Exp $
# $OpenBSD: Makefile,v 1.3 2005/02/09 23:41:43 naddy Exp $
# $FreeBSD: ports/multimedia/libquicktime/Makefile,v 1.19 2004/03/16 04:23:53 edwin Exp $
SHARED_ONLY= Yes
COMMENT= library for reading and writing quicktime files
DISTNAME= libquicktime-0.9.3
PKGNAME= ${DISTNAME}p0
CATEGORIES= multimedia
HOMEPAGE= http://libquicktime.sourceforge.net/
@ -17,9 +18,9 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= GL GLU ICE SM X11 Xaw Xext Xi Xt Xv c gdk glib \
gmodule gtk iconv intl m mp3lame ogg ossaudio \
pthread z
WANTLIB= GL GLU ICE SM X11 Xaw Xext Xi Xt Xv a52 c gdk \
glib gmodule gtk iconv intl m mp3lame ogg \
ossaudio pthread z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libquicktime/}

4
multimedia/libquicktime/patches/patch-configure
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure,v 1.2 2004/12/04 21:44:34 sturm Exp $
$OpenBSD: patch-configure,v 1.3 2005/02/09 23:41:43 naddy Exp $
--- configure.orig Mon Jul 19 11:57:49 2004
+++ configure Mon Aug 9 03:17:56 2004
@@ -3500,12 +3500,10 @@ nto-qnx)
@ -112,7 +112,7 @@ $OpenBSD: patch-configure,v 1.2 2004/12/04 21:44:34 sturm Exp $
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ succeeded=yes
+ AVCODEC_LIBS="-lavcodec -logg"
+ AVCODEC_LIBS="-lavcodec -lmp3lame -la52 -lvorbisenc -lvorbis -logg -lm -lz -pthread"
+ fi # ffmpeg_acl
-

15
multimedia/libquicktime/patches/patch-src_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2004/12/04 21:44:34 sturm Exp $
--- src/Makefile.in.orig Fri Nov 26 00:46:51 2004
+++ src/Makefile.in Fri Nov 26 00:56:34 2004
$OpenBSD: patch-src_Makefile_in,v 1.2 2005/02/09 23:41:43 naddy Exp $
--- src/Makefile.in.orig Mon Jul 19 11:57:53 2004
+++ src/Makefile.in Thu Jan 27 21:27:58 2005
@@ -211,7 +211,7 @@ lib_LTLIBRARIES = libquicktime.la
# Library dependencies are emtpy no
# Maybe we need zlib to read compressed quicktime headers
@ -10,3 +10,12 @@ $OpenBSD: patch-src_Makefile_in,v 1.1 2004/12/04 21:44:34 sturm Exp $
@HAVE_FSEEKO_FALSE@FSEEKO_SRC = lqt_fseeko.c
@@ -392,7 +392,7 @@ clean-libLTLIBRARIES:
rm -f "$${dir}/so_locations"; \
done
libquicktime.la: $(libquicktime_la_OBJECTS) $(libquicktime_la_DEPENDENCIES)
- $(LINK) -rpath $(libdir) $(libquicktime_la_LDFLAGS) $(libquicktime_la_OBJECTS) $(libquicktime_la_LIBADD) $(LIBS)
+ $(LINK) -rpath $(libdir) $(libquicktime_la_LDFLAGS) $(libquicktime_la_OBJECTS) $(libquicktime_la_LIBADD)
mostlyclean-compile:
-rm -f *.$(OBJEXT) core *.core

12
multimedia/transcode/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2005/01/25 21:58:59 naddy Exp $
# $OpenBSD: Makefile,v 1.2 2005/02/09 23:41:43 naddy Exp $
COMMENT= "video stream processing tools"
DISTNAME= transcode-0.6.14
PKGNAME= ${DISTNAME}p0
CATEGORIES= multimedia
HOMEPAGE= http://www.transcoding.org/
@ -14,8 +15,8 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE SM X11 Xaw Xext Xpm Xt Xv c freetype \
m pthread stdc++ usbhid z
WANTLIB= ICE SM X11 Xext Xv c freetype m pthread \
usbhid vorbisenc z
MASTER_SITES= http://www.jakemsr.com/transcode/ \
http://dl.fkb.wormulon.net/transcode/
@ -56,7 +57,10 @@ SEPARATE_BUILD= concurrent
SHARED_ONLY= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
LDFLAGS="-L${LOCALBASE}/lib" \
FFMPEG_LIBS_EXTRALIBS="-lmp3lame -la52 -lvorbisenc -lvorbis -logg"
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/autotools
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--enable-a52 \

24
multimedia/transcode/patches/patch-configure
View File

@ -1,6 +1,24 @@
$OpenBSD: patch-configure,v 1.1.1.1 2005/01/25 21:58:59 naddy Exp $
--- configure.orig Wed Nov 17 19:54:16 2004
+++ configure Thu Dec 30 18:12:18 2004
$OpenBSD: patch-configure,v 1.2 2005/02/09 23:41:43 naddy Exp $
--- configure.orig Mon Nov 15 20:46:34 2004
+++ configure Thu Jan 27 20:46:05 2005
@@ -27170,7 +27170,7 @@ else
with_ffmpeg_libs_l="/usr${deflib}"
fi
-FFMPEG_LIBS_EXTRALIBS="-lm -lz $PTHREAD_LIBS"
+FFMPEG_LIBS_EXTRALIBS="$FFMPEG_LIBS_EXTRALIBS -lm -lz $PTHREAD_LIBS"
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$with_ffmpeg_libs_i"
@@ -27450,7 +27450,7 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_avcodec_avcodec_thread_init" >&5
echo "${ECHO_T}$ac_cv_lib_avcodec_avcodec_thread_init" >&6
if test $ac_cv_lib_avcodec_avcodec_thread_init = yes; then
- FFMPEG_LIBS_LIBS="-L$with_ffmpeg_libs_l -lavcodec $FFMPEG_LIB_EXTRALIBS"
+ FFMPEG_LIBS_LIBS="-L$with_ffmpeg_libs_l -lavcodec $FFMPEG_LIBS_EXTRALIBS"
else
{ { echo "$as_me:$LINENO: error: error transcode depends on the FFmpeg (libavcodec) libraries and headers" >&5
echo "$as_me: error: error transcode depends on the FFmpeg (libavcodec) libraries and headers" >&2;}
@@ -37422,7 +37422,7 @@ if test "${ac_cv_lib_mjpegutils_y4m_si_g
echo $ECHO_N "(cached) $ECHO_C" >&6
else