update to subversion snapshot from 2008-06-20.
added since last update: - AVM2 (Flash 9) SWF muxer - QT variant of IMA ADPCM encoder - VFW grabber - Ipod/Iphone compatible mp4 muxer - Mimic decoder - MSN TCP Webcam stream demuxer - RL2 demuxer / decoder - IFF demuxer - 8SVX audio decoder - BFI demuxer - MAXIS EA XA (.xa) demuxer / decoder - BFI video decoder - OMA demuxer also: * headers have been moved to library specific subdirectories instead of all under ffmpeg. * libswscale is now enabled in the build. feedback/ok brad@
This commit is contained in:
parent
7f6b72ca58
commit
f78c7b80a6
@ -1,15 +1,16 @@
|
||||
# $OpenBSD: Makefile,v 1.35 2008/01/30 03:58:52 jakemsr Exp $
|
||||
# $OpenBSD: Makefile,v 1.36 2008/07/09 01:57:44 jakemsr Exp $
|
||||
|
||||
COMMENT= audio/video converter and streamer with bktr(4) support
|
||||
|
||||
V= 20080118
|
||||
V= 20080620
|
||||
DISTNAME= ffmpeg-svn-${V}
|
||||
PKGNAME= ffmpeg-${V}p0
|
||||
SHARED_LIBS= avutil 5.0 \
|
||||
avcodec 11.0 \
|
||||
avformat 11.0 \
|
||||
postproc 11.0 \
|
||||
avdevice 1.0
|
||||
PKGNAME= ffmpeg-${V}
|
||||
SHARED_LIBS= avutil 6.0 \
|
||||
avcodec 12.0 \
|
||||
avformat 12.0 \
|
||||
postproc 12.0 \
|
||||
avdevice 2.0 \
|
||||
swscale 1.0
|
||||
|
||||
CATEGORIES= graphics multimedia
|
||||
|
||||
@ -34,24 +35,26 @@ LIB_DEPENDS= SDL.>=4::devel/sdl \
|
||||
a52::audio/liba52 \
|
||||
x264::multimedia/x264 \
|
||||
theora::multimedia/libtheora \
|
||||
Imlib2::graphics/imlib2
|
||||
Imlib2::graphics/imlib2 \
|
||||
bz2.>=10::archivers/bzip2
|
||||
|
||||
WANTLIB= X11 Xext c freetype m pthread ogg ossaudio z
|
||||
|
||||
USE_X11= Yes
|
||||
USE_GMAKE= Yes
|
||||
|
||||
# It's either this or disable mmx so postprocess_template.c will build.
|
||||
# libswscale/swscale_template.c will not compile without this.
|
||||
.if ${MACHINE_ARCH} == "i386"
|
||||
CFLAGS+=-fomit-frame-pointer
|
||||
.endif
|
||||
|
||||
# inter-library dependencies for the current configuration
|
||||
LIBavutil_EXTRALIBS=-lm
|
||||
LIBavcodec_EXTRALIBS=-lavutil -L${LOCALBASE}/lib -lfaac -lfaad -lmp3lame -lvorbis -lvorbisenc -la52 -ltheora -logg -lx264 -lz -lm -pthread -Wl,-rpath,${LOCALBASE}/lib
|
||||
LIBavformat_EXTRALIBS=-lavutil -lavcodec -lm -Wl,-rpath,${LOCALBASE}/lib
|
||||
LIBpostproc_EXTRALIBS=-lavutil -lm
|
||||
LIBavdevice_EXTRALIBS=-lavutil -lavformat -L${X11BASE}/lib -lX11 -lXext -lossaudio -lm -Wl,-rpath,${LOCALBASE}/lib -Wl,-rpath,${X11BASE}/lib
|
||||
LIBavcodec_EXTRALIBS=-L${LOCALBASE}/lib -lfaac -lfaad -lmp3lame -lvorbis -lvorbisenc -la52 -ltheora -logg -lx264 -lz -lm -pthread -Wl,-rpath,${LOCALBASE}/lib
|
||||
LIBavformat_EXTRALIBS=-L${LOCALBASE}/lib -lbz2 -lm -Wl,-rpath,${LOCALBASE}/lib
|
||||
LIBpostproc_EXTRALIBS=-lm
|
||||
LIBavdevice_EXTRALIBS=-L${X11BASE}/lib -lX11 -lXext -lossaudio -lm -Wl,-rpath,${LOCALBASE}/lib -Wl,-rpath,${X11BASE}/lib
|
||||
LIBswscale_EXTRALIBS=-lm
|
||||
|
||||
# configure wants a directory it can execute files in
|
||||
WRKTMP= ${WRKDIR}/tmp
|
||||
@ -62,9 +65,10 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
|
||||
--mandir=${PREFIX}/man \
|
||||
--disable-debug \
|
||||
--disable-optimizations \
|
||||
--enable-pp \
|
||||
--enable-gpl \
|
||||
--enable-pthreads \
|
||||
--enable-postproc \
|
||||
--enable-swscale \
|
||||
--enable-liba52 \
|
||||
--enable-libfaac \
|
||||
--enable-libfaad \
|
||||
@ -82,28 +86,31 @@ CONFIGURE_ENV+= LIBavutil_EXTRALIBS="${LIBavutil_EXTRALIBS}" \
|
||||
LIBavformat_EXTRALIBS="${LIBavformat_EXTRALIBS}" \
|
||||
LIBpostproc_EXTRALIBS="${LIBpostproc_EXTRALIBS}" \
|
||||
LIBavdevice_EXTRALIBS="${LIBavdevice_EXTRALIBS}" \
|
||||
LIBswscale_EXTRALIBS="${LIBswscale_EXTRALIBS}" \
|
||||
TMPDIR=${WRKTMP} \
|
||||
CPPFLAGS="-I${X11BASE}/include"
|
||||
|
||||
MAKE_FLAGS= LIBavutil_VERSION=$(LIBavutil_VERSION) \
|
||||
LIBavcodec_VERSION=$(LIBavcodec_VERSION) \
|
||||
LIBavformat_VERSION=$(LIBavformat_VERSION) \
|
||||
LIBpostproc_VERSION=$(LIBpostproc_VERSION) \
|
||||
LIBavdevice_VERSION=$(LIBavdevice_VERSION) \
|
||||
VERSION_FLAGS= libavutil_VERSION=$(LIBavutil_VERSION) \
|
||||
libavcodec_VERSION=$(LIBavcodec_VERSION) \
|
||||
libavformat_VERSION=$(LIBavformat_VERSION) \
|
||||
libpostproc_VERSION=$(LIBpostproc_VERSION) \
|
||||
libavdevice_VERSION=$(LIBavdevice_VERSION) \
|
||||
libswscale_VERSION=${LIBswscale_VERSION}
|
||||
|
||||
MAKE_FLAGS= ${VERSION_FLAGS} \
|
||||
LIBavutil_EXTRALIBS="${LIBavutil_EXTRALIBS}" \
|
||||
LIBavcodec_EXTRALIBS="-L${WRKBUILD}/libavutil ${LIBavcodec_EXTRALIBS}" \
|
||||
LIBavformat_EXTRALIBS="-L${WRKBUILD}/libavutil -L${WRKBUILD}/libavcodec ${LIBavformat_EXTRALIBS}" \
|
||||
LIBpostproc_EXTRALIBS="-L${WRKBUILD}/libavutil ${LIBpostproc_EXTRALIBS}" \
|
||||
LIBavdevice_EXTRALIBS="-L${WRKBUILD}/libavutil -L${WRKBUILD}/libavformat ${LIBavdevice_EXTRALIBS}"
|
||||
LIBavcodec_EXTRALIBS="-lavutil ${LIBavcodec_EXTRALIBS}" \
|
||||
LIBavformat_EXTRALIBS="-lavutil -lavcodec ${LIBavformat_EXTRALIBS}" \
|
||||
LIBpostproc_EXTRALIBS="-lavutil ${LIBpostproc_EXTRALIBS}" \
|
||||
LIBavdevice_EXTRALIBS="-lavutil -lavformat ${LIBavdevice_EXTRALIBS}" \
|
||||
LIBswscale_EXTRALIBS="-lavutil ${LIBswscale_EXTRALIBS}"
|
||||
|
||||
FAKE_FLAGS= LDCONFIG=true \
|
||||
LIBavutil_VERSION=$(LIBavutil_VERSION) \
|
||||
LIBavcodec_VERSION=$(LIBavcodec_VERSION) \
|
||||
LIBavformat_VERSION=$(LIBavformat_VERSION) \
|
||||
LIBpostproc_VERSION=$(LIBpostproc_VERSION) \
|
||||
LIBavdevice_VERSION=$(LIBavdevice_VERSION)
|
||||
FAKE_FLAGS= ${VERSION_FLAGS} \
|
||||
LDCONFIG=true
|
||||
|
||||
REGRESS_TARGET= codectest
|
||||
# regression tests incompatible with libswscale
|
||||
#REGRESS_TARGET= codectest
|
||||
NO_REGRESS= Yes
|
||||
|
||||
pre-configure:
|
||||
-mkdir ${WRKTMP}
|
||||
|
@ -1,5 +1,5 @@
|
||||
MD5 (ffmpeg-svn-20080118.tar.gz) = f5151nfIIQ0JmQDaJdkxfQ==
|
||||
RMD160 (ffmpeg-svn-20080118.tar.gz) = 4Qmj/T1XSs925murnqVU+l2P5kY=
|
||||
SHA1 (ffmpeg-svn-20080118.tar.gz) = 9h7k0QG9e5vv1+AGXQzmgIk+Xrc=
|
||||
SHA256 (ffmpeg-svn-20080118.tar.gz) = ftpkILbuYVAwZYl/l9GrQBCPk0NMyWTCMcemw//oAg4=
|
||||
SIZE (ffmpeg-svn-20080118.tar.gz) = 2936599
|
||||
MD5 (ffmpeg-svn-20080620.tar.gz) = Fw6PXujyBxL/tiiP1hkaKQ==
|
||||
RMD160 (ffmpeg-svn-20080620.tar.gz) = Zc44krKBfDr//i3jBt9/88bxtqQ=
|
||||
SHA1 (ffmpeg-svn-20080620.tar.gz) = 1RsSdmWkrUcq1D+em/JxdgaJeJg=
|
||||
SHA256 (ffmpeg-svn-20080620.tar.gz) = u160eprOBubbrZyLWtMFxTNrC0EnBmcA/qO3hYNroj8=
|
||||
SIZE (ffmpeg-svn-20080620.tar.gz) = 3052991
|
||||
|
@ -1,39 +0,0 @@
|
||||
$OpenBSD: patch-common_mak,v 1.6 2008/01/26 01:56:02 jakemsr Exp $
|
||||
--- common.mak.orig Fri Dec 14 23:57:08 2007
|
||||
+++ common.mak Sun Jan 20 00:45:42 2008
|
||||
@@ -10,9 +10,10 @@ OBJS += $(OBJS-yes)
|
||||
ASM_OBJS += $(ASM_OBJS-yes)
|
||||
CPP_OBJS += $(CPP_OBJS-yes)
|
||||
|
||||
-CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
|
||||
- -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \
|
||||
- -I$(SRC_PATH)/libavutil $(OPTFLAGS)
|
||||
+# already added in top level Makefile
|
||||
+#CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
|
||||
+# -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \
|
||||
+# -I$(SRC_PATH)/libavutil $(OPTFLAGS)
|
||||
|
||||
SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp)
|
||||
OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS)
|
||||
@@ -66,13 +67,14 @@ install-libs: $(INSTALL_TARGETS-yes)
|
||||
|
||||
install-lib-shared: $(SLIBNAME)
|
||||
install -d "$(SHLIBDIR)"
|
||||
- install -m 755 $(SLIBNAME) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
|
||||
- $(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
|
||||
- cd "$(SHLIBDIR)" && \
|
||||
- $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
|
||||
- cd "$(SHLIBDIR)" && \
|
||||
- $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
|
||||
- $(SLIB_INSTALL_EXTRA_CMD)
|
||||
+# install -m 755 $(SLIBNAME) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
|
||||
+# $(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
|
||||
+# cd "$(SHLIBDIR)" && \
|
||||
+# $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
|
||||
+# cd "$(SHLIBDIR)" && \
|
||||
+# $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
|
||||
+# $(SLIB_INSTALL_EXTRA_CMD)
|
||||
+ install -m 755 $(SLIBNAME) $(SHLIBDIR)
|
||||
|
||||
install-lib-static: $(LIBNAME)
|
||||
install -d "$(LIBDIR)"
|
@ -1,7 +1,101 @@
|
||||
$OpenBSD: patch-configure,v 1.18 2008/01/26 01:56:02 jakemsr Exp $
|
||||
--- configure.orig Fri Jan 18 01:21:47 2008
|
||||
+++ configure Sun Jan 20 00:36:03 2008
|
||||
@@ -1785,7 +1785,7 @@ enabled extra_warnings && check_cflags -Winline
|
||||
$OpenBSD: patch-configure,v 1.19 2008/07/09 01:57:44 jakemsr Exp $
|
||||
--- configure.orig Fri Jun 20 19:40:11 2008
|
||||
+++ configure Sat Jul 5 03:08:34 2008
|
||||
@@ -953,9 +953,9 @@ enable stripping
|
||||
vhook="default"
|
||||
|
||||
# build settings
|
||||
-SHFLAGS='-shared -Wl,-soname,$$(@F)'
|
||||
+SHFLAGS='-shared'
|
||||
VHOOKSHFLAGS='$(SHFLAGS)'
|
||||
-LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libpostproc -Wl,-rpath-link,\$(BUILD_ROOT)/libswscale -Wl,-rpath-link,\$(BUILD_ROOT)/libavfilter -Wl,-rpath-link,\$(BUILD_ROOT)/libavdevice -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
|
||||
+LDLATEFLAGS=''
|
||||
FFSERVERLDFLAGS=-Wl,-E
|
||||
LIBPREF="lib"
|
||||
LIBSUF=".a"
|
||||
@@ -965,7 +965,7 @@ SLIBPREF="lib"
|
||||
SLIBSUF=".so"
|
||||
SLIBNAME='$(SLIBPREF)$(FULLNAME)$(SLIBSUF)'
|
||||
SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'
|
||||
-SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
|
||||
+SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBVERSION)'
|
||||
LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(LIBDIR)/$(LIBNAME)"'
|
||||
|
||||
# gcc stupidly only outputs the basename of targets with -MM
|
||||
@@ -1213,9 +1213,9 @@ case $target_os in
|
||||
disable need_memalign
|
||||
LIBOBJFLAGS='$(PIC)'
|
||||
SHFLAGS='-shared'
|
||||
- SLIBNAME='$(SLIBPREF)$(FULLNAME)$(SLIBSUF).$(LIBVERSION)'
|
||||
- SLIBNAME_WITH_VERSION='$(SLIBNAME)'
|
||||
- SLIBNAME_WITH_MAJOR='$(SLIBNAME)'
|
||||
+ #SLIBNAME='$(SLIBPREF)$(FULLNAME)$(SLIBSUF).$(LIBVERSION)'
|
||||
+ #SLIBNAME_WITH_VERSION='$(SLIBNAME)'
|
||||
+ #SLIBNAME_WITH_MAJOR='$(SLIBNAME)'
|
||||
oss_demuxer_extralibs="-lossaudio"
|
||||
oss_muxer_extralibs="-lossaudio"
|
||||
;;
|
||||
@@ -1501,7 +1501,7 @@ fi
|
||||
check_cc <<EOF || die "Symbol mangling check failed."
|
||||
int ff_extern;
|
||||
EOF
|
||||
-sym=$($nm -P -g $TMPO | grep ff_extern)
|
||||
+sym=$($nm -g $TMPO | grep ff_extern | cut -d ' ' -f 3)
|
||||
extern_prefix=${sym%%ff_extern*}
|
||||
|
||||
check_asm inline_asm '""'
|
||||
@@ -1582,10 +1582,14 @@ enabled vis && add_cflags "-mcpu=ultrasparc -mtune=ult
|
||||
|
||||
# ---
|
||||
# big/little-endian test
|
||||
-check_cc <<EOF || die "endian test failed"
|
||||
-unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';
|
||||
+check_exec <<EOF || enable bigendian
|
||||
+#include <sys/types.h>
|
||||
+int main(void) {
|
||||
+ if (_BYTE_ORDER == _BIG_ENDIAN)
|
||||
+ return 1;
|
||||
+ return 0;
|
||||
+}
|
||||
EOF
|
||||
-od -A n -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
|
||||
|
||||
# ---
|
||||
# check availability of some header files
|
||||
@@ -1607,7 +1611,7 @@ check_func2 windows.h GetProcessTimes
|
||||
check_header byteswap.h
|
||||
check_header conio.h
|
||||
check_header dlfcn.h
|
||||
-check_header malloc.h
|
||||
+#check_header malloc.h
|
||||
check_header sys/mman.h
|
||||
check_header sys/resource.h
|
||||
check_header termios.h
|
||||
@@ -1717,10 +1721,10 @@ if test "$target_os" = cygwin -o "$target_os" = mingw3
|
||||
echo
|
||||
fi
|
||||
|
||||
-if enabled vhook; then
|
||||
- check_ldflags -rdynamic
|
||||
- check_ldflags -export-dynamic
|
||||
-fi
|
||||
+#if enabled vhook; then
|
||||
+# check_ldflags -rdynamic
|
||||
+# check_ldflags -export-dynamic
|
||||
+#fi
|
||||
|
||||
check_foo_config imlib2 imlib2 Imlib2.h imlib_load_font
|
||||
check_foo_config freetype2 freetype ft2build.h FT_Init_FreeType
|
||||
@@ -1756,7 +1760,7 @@ fi
|
||||
|
||||
texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
|
||||
|
||||
-check_type sys/socket.h socklen_t
|
||||
+check_type sys/types.h socklen_t
|
||||
|
||||
##########################################
|
||||
# Network check
|
||||
@@ -1831,7 +1835,7 @@ enabled extra_warnings && check_cflags -Winline
|
||||
# add some linker flags
|
||||
check_ldflags -Wl,--warn-common
|
||||
check_ldflags $LDLATEFLAGS
|
||||
@ -10,43 +104,38 @@ $OpenBSD: patch-configure,v 1.18 2008/01/26 01:56:02 jakemsr Exp $
|
||||
|
||||
if enabled small; then
|
||||
check_cflags -Os # not all compilers support -Os
|
||||
@@ -2158,28 +2158,28 @@ Cflags: -I\${includedir}
|
||||
@@ -2204,8 +2208,7 @@ Version: $version
|
||||
Requires: $(disabled shared && echo $requires)
|
||||
Requires.private: $(enabled shared && echo $requires)
|
||||
Conflicts:
|
||||
-Libs: -L\${libdir} -l${shortname} $(disabled shared && echo $libs)
|
||||
-Libs.private: $(enabled shared && echo $libs)
|
||||
+Libs: -L\${libdir} -l${shortname} $libs
|
||||
Cflags: -I\${includedir}
|
||||
EOF
|
||||
cat <<EOF > $name/$name-uninstalled.pc
|
||||
@@ -2224,17 +2227,17 @@ Cflags: -I\${includedir}
|
||||
EOF
|
||||
}
|
||||
|
||||
-pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version" -lavutil "" ffmpeg
|
||||
+pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version" "-lavutil $LIBavutil_EXTRALIBS" "" ffmpeg
|
||||
pkgconfig_generate_uninstalled libavutil "FFmpeg utility library" "$lavu_version"
|
||||
|
||||
-pkgconfig_generate libavcodec "FFmpeg codec library" "$lavc_version" "-lavcodec $extralibs" "$pkg_requires libavutil = $lavu_version" ffmpeg
|
||||
-pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$lavc_version" "$extralibs" "$pkg_requires libavutil = $lavu_version"
|
||||
+pkgconfig_generate libavcodec "FFmpeg codec library" "$lavc_version" "-lavcodec $LIBavcodec_EXTRALIBS" "libavutil = $lavu_version" ffmpeg
|
||||
+pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$lavc_version" "-pthread"
|
||||
|
||||
-pkgconfig_generate libavformat "FFmpeg container format library" "$lavf_version" "-lavformat $extralibs" "$pkg_requires libavcodec = $lavc_version" ffmpeg
|
||||
-pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$lavf_version" "$extralibs" "$pkg_requires libavcodec = $lavc_version"
|
||||
+pkgconfig_generate libavformat "FFmpeg container format library" "$lavf_version" "-lavformat $LIBavformat_EXTRALIBS" "libavutil = $lavu_version libavcodec = $lavc_version" ffmpeg
|
||||
+pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$lavf_version"
|
||||
|
||||
-pkgconfig_generate libavdevice "FFmpeg device handling library" "$lavd_version" "-lavdevice $extralibs" "$pkg_requires libavformat = $lavf_version" ffmpeg
|
||||
-pkgconfig_generate_uninstalled libavdevice "FFmpeg device handling library" "$lavd_version" "$extralibs" "$pkg_requires libavformat = $lavf_version"
|
||||
+pkgconfig_generate libavdevice "FFmpeg device handling library" "$lavd_version" "-lavdevice $LIBavdevice_EXTRALIBS" "libavutil = $lavu_version libavformat = $lavf_version" ffmpeg
|
||||
+pkgconfig_generate_uninstalled libavdevice "FFmpeg device handling library" "$lavd_version"
|
||||
if enabled pp; then
|
||||
- pkgconfig_generate libpostproc "FFmpeg post processing library" "$pp_version" -lpostproc "" postproc
|
||||
+ pkgconfig_generate libpostproc "FFmpeg post processing library" "$pp_version" "-lpostproc $LIBpostproc_EXTRALIBS" "libavutil = $lavu_version " postproc
|
||||
pkgconfig_generate_uninstalled libpostproc "FFmpeg post processing library" "$pp_version"
|
||||
fi
|
||||
|
||||
if enabled swscaler; then
|
||||
pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" -lswscale "libavutil = $lavu_version" ffmpeg
|
||||
- pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "libavutil = $lavu_version"
|
||||
+ pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version"
|
||||
-pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION"
|
||||
-pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION"
|
||||
-pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION"
|
||||
-pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "$pkg_requires libavformat = $LIBAVFORMAT_VERSION"
|
||||
+pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "$LIBavutil_EXTRALIBS"
|
||||
+pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$LIBavcodec_EXTRALIBS" "libavutil"
|
||||
+pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$LIBavformat_EXTRALIBS" "libavutil libavcodec"
|
||||
+pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$LIBavdevice_EXTRALIBS" "libavutil libavformat"
|
||||
enabled avfilter &&
|
||||
pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION"
|
||||
enabled postproc &&
|
||||
- pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION"
|
||||
+ pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION" "$LIBpostproc_EXTRALIBS" "libavutil"
|
||||
if enabled swscale; then
|
||||
- pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"
|
||||
+ pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBswscale_EXTRALIBS" "libavutil"
|
||||
else
|
||||
- pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version" ffmpeg
|
||||
- pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version"
|
||||
+ pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "" "libavcodec = $lavc_version" ffmpeg
|
||||
+ pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version"
|
||||
apply libswscale.pc sed s/^Libs:.*$/Libs:/
|
||||
apply libswscale-uninstalled.pc sed s/^Libs:.*$/Libs:/
|
||||
- pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION"
|
||||
+ pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBswscale_EXTRALIBS"
|
||||
apply libswscale/libswscale.pc sed s/^Libs:.*$/Libs:/
|
||||
fi
|
||||
|
@ -1,36 +0,0 @@
|
||||
$OpenBSD: patch-libavcodec_Makefile,v 1.16 2008/01/26 01:56:02 jakemsr Exp $
|
||||
--- libavcodec/Makefile.orig Fri Jan 18 01:21:38 2008
|
||||
+++ libavcodec/Makefile Mon Jan 21 14:19:24 2008
|
||||
@@ -431,6 +431,9 @@ ALTIVEC-OBJS-$(CONFIG_WMV3_DECODER) += ppc/vc1dsp_a
|
||||
# -maltivec is needed in order to build AltiVec code.
|
||||
$(ALTIVEC-OBJS-yes): CFLAGS += -maltivec -mabi=altivec
|
||||
|
||||
+# compiler optimizations cause problems
|
||||
+ppc/mpegvideo_altivec.o: CFLAGS += -O
|
||||
+
|
||||
# check_altivec must be built without -maltivec
|
||||
OBJS-$(HAVE_ALTIVEC) += $(ALTIVEC-OBJS-yes) \
|
||||
ppc/check_altivec.o
|
||||
@@ -444,10 +447,11 @@ ASM_OBJS-$(ARCH_BFIN) += bfin/pixels_
|
||||
bfin/idct_bfin.o \
|
||||
bfin/vp3_idct_bfin.o \
|
||||
|
||||
-EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
|
||||
+#EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
|
||||
+EXTRALIBS=${LIBavcodec_EXTRALIBS}
|
||||
|
||||
NAME=avcodec
|
||||
-LIBVERSION=$(LAVCVERSION)
|
||||
+LIBVERSION=$(LIBavcodec_VERSION)
|
||||
LIBMAJOR=$(LAVCMAJOR)
|
||||
|
||||
include ../common.mak
|
||||
@@ -482,7 +486,7 @@ dct-test: dct-test.o fdctref.o $(LIBNAME)
|
||||
fft-test: fft-test.o $(LIBNAME)
|
||||
|
||||
imgresample-test: imgresample.c $(LIBNAME)
|
||||
- $(CC) $(CFLAGS) -DTEST -o $@ $^ $(EXTRALIBS)
|
||||
+ $(CC) $(CFLAGS) -DTEST -o $@ $^ $(LIBavcodec_EXTRALIBS)
|
||||
|
||||
motion-test: motion-test.o $(LIBNAME)
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-libavcodec_dsputil_c,v 1.4 2008/01/26 01:56:02 jakemsr Exp $
|
||||
--- libavcodec/dsputil.c.orig Fri Jan 18 01:21:39 2008
|
||||
+++ libavcodec/dsputil.c Sat Jan 19 18:35:16 2008
|
||||
@@ -3970,7 +3970,7 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx
|
||||
$OpenBSD: patch-libavcodec_dsputil_c,v 1.5 2008/07/09 01:57:44 jakemsr Exp $
|
||||
--- libavcodec/dsputil.c.orig Sat May 24 22:01:01 2008
|
||||
+++ libavcodec/dsputil.c Fri Jun 20 22:38:19 2008
|
||||
@@ -4118,7 +4118,7 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx
|
||||
{
|
||||
int i;
|
||||
|
||||
|
@ -1,37 +1,37 @@
|
||||
$OpenBSD: patch-libavcodec_libfaad_c,v 1.2 2008/01/26 01:56:02 jakemsr Exp $
|
||||
--- libavcodec/libfaad.c.orig Fri Jan 18 01:21:38 2008
|
||||
+++ libavcodec/libfaad.c Sat Jan 19 18:35:16 2008
|
||||
$OpenBSD: patch-libavcodec_libfaad_c,v 1.3 2008/07/09 01:57:44 jakemsr Exp $
|
||||
--- libavcodec/libfaad.c.orig Fri Jun 20 19:40:02 2008
|
||||
+++ libavcodec/libfaad.c Fri Jun 20 23:06:05 2008
|
||||
@@ -73,21 +73,21 @@ typedef struct {
|
||||
short *sample_buffer,
|
||||
unsigned long *samples);
|
||||
short *sample_buffer,
|
||||
unsigned long *samples);
|
||||
#else
|
||||
- unsigned char FAADAPI (*faacDecSetConfiguration)(faacDecHandle hDecoder,
|
||||
+ uint8_t FAADAPI (*faacDecSetConfiguration)(faacDecHandle hDecoder,
|
||||
- unsigned char FAADAPI (*faacDecSetConfiguration)(faacDecHandle hDecoder,
|
||||
+ uint8_t FAADAPI (*faacDecSetConfiguration)(faacDecHandle hDecoder,
|
||||
faacDecConfigurationPtr config);
|
||||
- long FAADAPI (*faacDecInit)(faacDecHandle hDecoder,
|
||||
- unsigned char *buffer,
|
||||
- unsigned long buffer_size,
|
||||
- unsigned long *samplerate,
|
||||
- unsigned char *channels);
|
||||
- char FAADAPI (*faacDecInit2)(faacDecHandle hDecoder, unsigned char *pBuffer,
|
||||
- long FAADAPI (*faacDecInit)(faacDecHandle hDecoder,
|
||||
- unsigned char *buffer,
|
||||
- unsigned long buffer_size,
|
||||
- unsigned long *samplerate,
|
||||
- unsigned char *channels);
|
||||
- char FAADAPI (*faacDecInit2)(faacDecHandle hDecoder, unsigned char *pBuffer,
|
||||
- unsigned long SizeOfDecoderSpecificInfo,
|
||||
- unsigned long *samplerate, unsigned char *channels);
|
||||
+ int32_t FAADAPI (*faacDecInit)(faacDecHandle hDecoder,
|
||||
+ uint8_t *buffer,
|
||||
+ uint32_t buffer_size,
|
||||
+ uint32_t *samplerate,
|
||||
+ uint8_t *channels);
|
||||
+ int8_t FAADAPI (*faacDecInit2)(faacDecHandle hDecoder, uint8_t *pBuffer,
|
||||
+ int32_t FAADAPI (*faacDecInit)(faacDecHandle hDecoder,
|
||||
+ uint8_t *buffer,
|
||||
+ uint32_t buffer_size,
|
||||
+ uint32_t *samplerate,
|
||||
+ uint8_t *channels);
|
||||
+ int8_t FAADAPI (*faacDecInit2)(faacDecHandle hDecoder, uint8_t *pBuffer,
|
||||
+ uint32_t SizeOfDecoderSpecificInfo,
|
||||
+ uint32_t *samplerate, uint8_t *channels);
|
||||
void *FAADAPI (*faacDecDecode)(faacDecHandle hDecoder,
|
||||
faacDecFrameInfo *hInfo,
|
||||
- unsigned char *buffer,
|
||||
- unsigned long buffer_size);
|
||||
- char* FAADAPI (*faacDecGetErrorMessage)(unsigned char errcode);
|
||||
+ uint8_t *buffer,
|
||||
+ uint32_t buffer_size);
|
||||
+ char* FAADAPI (*faacDecGetErrorMessage)(uint8_t errcode);
|
||||
void *FAADAPI (*faacDecDecode)(faacDecHandle hDecoder,
|
||||
faacDecFrameInfo *hInfo,
|
||||
- unsigned char *buffer,
|
||||
- unsigned long buffer_size);
|
||||
- char* FAADAPI (*faacDecGetErrorMessage)(unsigned char errcode);
|
||||
+ uint8_t *buffer,
|
||||
+ uint32_t buffer_size);
|
||||
+ int8_t* FAADAPI (*faacDecGetErrorMessage)(uint8_t errcode);
|
||||
#endif
|
||||
|
||||
void FAADAPI (*faacDecClose)(faacDecHandle hDecoder);
|
||||
@ -77,8 +77,8 @@ $OpenBSD: patch-libavcodec_libfaad_c,v 1.2 2008/01/26 01:56:02 jakemsr Exp $
|
||||
+ uint8_t channels;
|
||||
int r = s->faacDecInit(s->faac_handle, buf, buf_size, &srate, &channels);
|
||||
if(r < 0){
|
||||
av_log(avctx, AV_LOG_ERROR, "faac: codec init failed: %s\n",
|
||||
@@ -190,7 +190,7 @@ static int faac_decode_frame(AVCodecContext *avctx,
|
||||
av_log(avctx, AV_LOG_ERROR, "faac: codec init failed.\n");
|
||||
@@ -189,7 +189,7 @@ static int faac_decode_frame(AVCodecContext *avctx,
|
||||
s->init = 1;
|
||||
}
|
||||
|
||||
@ -87,28 +87,3 @@ $OpenBSD: patch-libavcodec_libfaad_c,v 1.2 2008/01/26 01:56:02 jakemsr Exp $
|
||||
|
||||
if (frame_info.error > 0) {
|
||||
av_log(avctx, AV_LOG_ERROR, "faac: frame decoding failed: %s\n",
|
||||
@@ -259,16 +259,16 @@ static int faac_decode_init(AVCodecContext *avctx)
|
||||
dfaac(Decode, (int FAADAPI (*)(faacDecHandle, unsigned char*,
|
||||
unsigned long*, short*, unsigned long*)));
|
||||
#else
|
||||
- dfaac(SetConfiguration, (unsigned char FAADAPI (*)(faacDecHandle,
|
||||
+ dfaac(SetConfiguration, (uint8_t FAADAPI (*)(faacDecHandle,
|
||||
faacDecConfigurationPtr)));
|
||||
- dfaac(Init, (long FAADAPI (*)(faacDecHandle, unsigned char*,
|
||||
- unsigned long, unsigned long*, unsigned char*)));
|
||||
- dfaac(Init2, (char FAADAPI (*)(faacDecHandle, unsigned char*,
|
||||
- unsigned long, unsigned long*,
|
||||
- unsigned char*)));
|
||||
+ dfaac(Init, (int32_t FAADAPI (*)(faacDecHandle, uint8_t*,
|
||||
+ uint32_t, uint32_t*, uint8_t*)));
|
||||
+ dfaac(Init2, (int8_t FAADAPI (*)(faacDecHandle, uint8_t*,
|
||||
+ uint32_t, uint32_t*,
|
||||
+ uint8_t*)));
|
||||
dfaac(Decode, (void *FAADAPI (*)(faacDecHandle, faacDecFrameInfo*,
|
||||
- unsigned char*, unsigned long)));
|
||||
- dfaac(GetErrorMessage, (char* FAADAPI (*)(unsigned char)));
|
||||
+ uint8_t*, uint32_t)));
|
||||
+ dfaac(GetErrorMessage, (int8_t* FAADAPI (*)(uint8_t)));
|
||||
#endif
|
||||
#undef dfacc
|
||||
|
||||
|
14
graphics/ffmpeg/patches/patch-libavcodec_libx264_c
Normal file
14
graphics/ffmpeg/patches/patch-libavcodec_libx264_c
Normal file
@ -0,0 +1,14 @@
|
||||
$OpenBSD: patch-libavcodec_libx264_c,v 1.1 2008/07/09 01:57:44 jakemsr Exp $
|
||||
--- libavcodec/libx264.c.orig Sat Jun 21 01:44:41 2008
|
||||
+++ libavcodec/libx264.c Sat Jun 21 01:45:02 2008
|
||||
@@ -220,8 +220,8 @@ X264_init(AVCodecContext *avctx)
|
||||
x4->params.analyse.i_me_method = X264_ME_UMH;
|
||||
else if(avctx->me_method == ME_FULL)
|
||||
x4->params.analyse.i_me_method = X264_ME_ESA;
|
||||
- else if(avctx->me_method == ME_TESA)
|
||||
- x4->params.analyse.i_me_method = X264_ME_TESA;
|
||||
+// else if(avctx->me_method == ME_TESA)
|
||||
+// x4->params.analyse.i_me_method = X264_ME_TESA;
|
||||
else x4->params.analyse.i_me_method = X264_ME_HEX;
|
||||
|
||||
x4->params.analyse.i_me_range = avctx->me_range;
|
@ -1,18 +0,0 @@
|
||||
$OpenBSD: patch-libavdevice_Makefile,v 1.1 2008/01/26 01:56:02 jakemsr Exp $
|
||||
--- libavdevice/Makefile.orig Fri Jan 18 01:21:47 2008
|
||||
+++ libavdevice/Makefile Sat Jan 19 18:36:15 2008
|
||||
@@ -1,12 +1,10 @@
|
||||
include ../config.mak
|
||||
|
||||
NAME=avdevice
|
||||
-LIBVERSION=$(LAVDVERSION)
|
||||
+LIBVERSION=$(LIBavdevice_VERSION)
|
||||
LIBMAJOR=$(LAVDMAJOR)
|
||||
|
||||
-EXTRALIBS := -L$(BUILD_ROOT)/libavformat -lavformat$(BUILDSUF) \
|
||||
- -L$(BUILD_ROOT)/libavcodec -lavcodec$(BUILDSUF) \
|
||||
- -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
|
||||
+EXTRALIBS=$(LIBavdevice_EXTRALIBS)
|
||||
|
||||
CFLAGS += -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat
|
||||
|
@ -1,22 +0,0 @@
|
||||
$OpenBSD: patch-libavformat_Makefile,v 1.15 2008/01/26 01:56:02 jakemsr Exp $
|
||||
--- libavformat/Makefile.orig Fri Jan 18 01:21:46 2008
|
||||
+++ libavformat/Makefile Sat Jan 19 18:36:51 2008
|
||||
@@ -158,8 +158,7 @@ OBJS-$(CONFIG_LIBNUT_MUXER) += libnut.o r
|
||||
|
||||
OBJS-$(CONFIG_VHOOK) += framehook.o
|
||||
|
||||
-EXTRALIBS := -L$(BUILD_ROOT)/libavcodec -lavcodec$(BUILDSUF) \
|
||||
- -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
|
||||
+EXTRALIBS=${LIBavformat_EXTRALIBS}
|
||||
|
||||
# protocols I/O
|
||||
OBJS+= avio.o aviobuf.o
|
||||
@@ -172,7 +171,7 @@ OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o
|
||||
OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o
|
||||
|
||||
NAME=avformat
|
||||
-LIBVERSION=$(LAVFVERSION)
|
||||
+LIBVERSION=$(LIBavformat_VERSION)
|
||||
LIBMAJOR=$(LAVFMAJOR)
|
||||
|
||||
include ../common.mak
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-libavformat_os_support_h,v 1.1 2008/01/26 01:56:02 jakemsr Exp $
|
||||
--- libavformat/os_support.h.orig Sat Jan 19 19:27:17 2008
|
||||
+++ libavformat/os_support.h Sat Jan 19 19:56:55 2008
|
||||
@@ -27,7 +27,7 @@
|
||||
* miscellaneous OS support macros and functions.
|
||||
*/
|
||||
|
||||
-#ifndef HAVE_SOCKLEN_T
|
||||
+#if 0
|
||||
typedef int socklen_t;
|
||||
#endif
|
||||
|
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-libavutil_Makefile,v 1.5 2008/01/26 01:56:02 jakemsr Exp $
|
||||
--- libavutil/Makefile.orig Fri Jan 18 01:21:41 2008
|
||||
+++ libavutil/Makefile Sat Jan 19 18:35:16 2008
|
||||
@@ -39,7 +39,9 @@ HEADERS = adler32.h \
|
||||
sha1.h
|
||||
|
||||
NAME=avutil
|
||||
-LIBVERSION=$(LAVUVERSION)
|
||||
+LIBVERSION=$(LIBavutil_VERSION)
|
||||
LIBMAJOR=$(LAVUMAJOR)
|
||||
+
|
||||
+EXTRALIBS=${LIBavutil_EXTRALIBS}
|
||||
|
||||
include ../common.mak
|
@ -1,17 +0,0 @@
|
||||
$OpenBSD: patch-libpostproc_Makefile,v 1.4 2008/01/26 01:56:02 jakemsr Exp $
|
||||
--- libpostproc/Makefile.orig Wed Oct 31 23:07:10 2007
|
||||
+++ libpostproc/Makefile Sat Jan 19 16:56:10 2008
|
||||
@@ -4,10 +4,11 @@ include ../config.mak
|
||||
# Overload incdir, postproc include files go in a different directory.
|
||||
INCDIR=$(prefix)/include/postproc
|
||||
|
||||
-EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
|
||||
+#EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
|
||||
+EXTRALIBS=${LIBpostproc_EXTRALIBS}
|
||||
|
||||
NAME=postproc
|
||||
-LIBVERSION=$(SPPVERSION)
|
||||
+LIBVERSION=$(LIBpostproc_VERSION)
|
||||
LIBMAJOR=$(SPPMAJOR)
|
||||
|
||||
HEADERS = postprocess.h
|
@ -1,35 +0,0 @@
|
||||
$OpenBSD: patch-libpostproc_postprocess_template_c,v 1.1 2008/01/26 01:56:02 jakemsr Exp $
|
||||
--- libpostproc/postprocess_template.c.orig Mon Jan 21 18:24:55 2008
|
||||
+++ libpostproc/postprocess_template.c Mon Jan 21 18:25:45 2008
|
||||
@@ -3748,6 +3748,7 @@ static void RENAME(postProcess)(uint8_t src[], int src
|
||||
if(y>0) RENAME(dering)(dstBlock - stride - 8, stride, &c);
|
||||
}
|
||||
|
||||
+#if 0
|
||||
if(mode & TEMP_NOISE_FILTER)
|
||||
{
|
||||
RENAME(tempNoiseReducer)(dstBlock-8, stride,
|
||||
@@ -3755,6 +3756,7 @@ static void RENAME(postProcess)(uint8_t src[], int src
|
||||
c.tempBluredPast[isColor] + (y>>3)*256 + (x>>3),
|
||||
c.ppMode.maxTmpNoise);
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
dstBlock+=8;
|
||||
@@ -3772,6 +3774,7 @@ static void RENAME(postProcess)(uint8_t src[], int src
|
||||
if(y > 0) RENAME(dering)(dstBlock - dstStride - 8, dstStride, &c);
|
||||
}
|
||||
|
||||
+#if 0
|
||||
if((mode & TEMP_NOISE_FILTER))
|
||||
{
|
||||
RENAME(tempNoiseReducer)(dstBlock-8, dstStride,
|
||||
@@ -3779,6 +3782,7 @@ static void RENAME(postProcess)(uint8_t src[], int src
|
||||
c.tempBluredPast[isColor] + (y>>3)*256 + (x>>3),
|
||||
c.ppMode.maxTmpNoise);
|
||||
}
|
||||
+#endif
|
||||
|
||||
/* did we use a tmp buffer for the last lines*/
|
||||
if(y+15 >= height)
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-libswscale_Makefile,v 1.2 2007/05/25 15:54:14 jakemsr Exp $
|
||||
--- libswscale/Makefile.orig Wed Apr 4 21:25:05 2007
|
||||
+++ libswscale/Makefile Thu Apr 19 05:00:48 2007
|
||||
@@ -2,7 +2,7 @@
|
||||
include ../config.mak
|
||||
|
||||
NAME=swscale
|
||||
-LIBVERSION=$(SWSVERSION)
|
||||
+LIBVERSION=$(LIBswscale_VERSION)
|
||||
LIBMAJOR=$(SWSMAJOR)
|
||||
|
||||
EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
|
26
graphics/ffmpeg/patches/patch-subdir_mak
Normal file
26
graphics/ffmpeg/patches/patch-subdir_mak
Normal file
@ -0,0 +1,26 @@
|
||||
$OpenBSD: patch-subdir_mak,v 1.1 2008/07/09 01:57:44 jakemsr Exp $
|
||||
--- subdir.mak.orig Fri Jun 20 19:40:11 2008
|
||||
+++ subdir.mak Sat Jun 21 10:06:50 2008
|
||||
@@ -29,7 +29,7 @@ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
|
||||
|
||||
$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS)
|
||||
$(SLIB_CREATE_DEF_CMD)
|
||||
- $(CC) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$^ $(FFEXTRALIBS) $(EXTRAOBJS)
|
||||
+ $(CC) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $(sort $(OBJS)) $(LIB$(NAME)_EXTRALIBS) $(EXTRAOBJS)
|
||||
$(SLIB_EXTRA_CMD)
|
||||
|
||||
ifdef SUBDIR
|
||||
@@ -39,12 +39,8 @@ endif
|
||||
|
||||
install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
|
||||
install -d "$(SHLIBDIR)"
|
||||
- install -m 755 $(SUBDIR)$(SLIBNAME) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
|
||||
+ install -m 755 $(SUBDIR)$(SLIBNAME_WITH_VERSION) "$(SHLIBDIR)"
|
||||
$(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
|
||||
- cd "$(SHLIBDIR)" && \
|
||||
- $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
|
||||
- cd "$(SHLIBDIR)" && \
|
||||
- $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
|
||||
$(SLIB_INSTALL_EXTRA_CMD)
|
||||
|
||||
install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME)
|
@ -1,17 +1,17 @@
|
||||
$OpenBSD: patch-tests_regression_sh,v 1.4 2008/01/26 01:56:02 jakemsr Exp $
|
||||
--- tests/regression.sh.orig Sat Jan 19 18:12:53 2008
|
||||
+++ tests/regression.sh Sat Jan 19 18:14:20 2008
|
||||
@@ -93,7 +93,8 @@ fi
|
||||
|
||||
$OpenBSD: patch-tests_regression_sh,v 1.5 2008/07/09 01:57:44 jakemsr Exp $
|
||||
--- tests/regression.sh.orig Sat May 24 22:01:10 2008
|
||||
+++ tests/regression.sh Fri Jun 20 22:38:19 2008
|
||||
@@ -17,7 +17,8 @@ outfile="$datadir/$4-"
|
||||
eval do_$test=y
|
||||
|
||||
# various files
|
||||
-ffmpeg="./ffmpeg_g"
|
||||
+# ffmpeg="./ffmpeg_g"
|
||||
+ffmpeg="env LD_LIBRARY_PATH=./libavcodec:./libavutil:./libavformat:./libswscale ./ffmpeg_g"
|
||||
tiny_psnr="tests/tiny_psnr"
|
||||
reffile="$2"
|
||||
benchfile="$datadir/ffmpeg.bench"
|
||||
@@ -109,6 +110,8 @@ if [ X"`echo | md5sum 2> /dev/null`" != X ]; then
|
||||
benchfile="$datadir/$this.bench"
|
||||
bench="$datadir/$this.bench.tmp"
|
||||
@@ -34,6 +35,8 @@ if [ X"`echo | md5sum 2> /dev/null`" != X ]; then
|
||||
do_md5sum() { md5sum -b $1; }
|
||||
elif [ -x /sbin/md5 ]; then
|
||||
do_md5sum() { /sbin/md5 -r $1 | sed 's# \**\./# *./#'; }
|
||||
|
@ -1,9 +1,10 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.17 2008/01/26 01:56:02 jakemsr Exp $
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.18 2008/07/09 01:57:44 jakemsr Exp $
|
||||
@lib lib/libavcodec.so.${LIBavcodec_VERSION}
|
||||
@lib lib/libavdevice.so.${LIBavdevice_VERSION}
|
||||
@lib lib/libavformat.so.${LIBavformat_VERSION}
|
||||
@lib lib/libavutil.so.${LIBavutil_VERSION}
|
||||
@lib lib/libpostproc.so.${LIBpostproc_VERSION}
|
||||
@lib lib/libswscale.so.${LIBswscale_VERSION}
|
||||
lib/vhook/drawtext.so
|
||||
lib/vhook/fish.so
|
||||
lib/vhook/imlib2.so
|
||||
|
@ -1,42 +1,46 @@
|
||||
@comment $OpenBSD: PLIST,v 1.14 2008/01/26 01:56:02 jakemsr Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.15 2008/07/09 01:57:44 jakemsr Exp $
|
||||
%%SHARED%%
|
||||
bin/ffmpeg
|
||||
bin/ffplay
|
||||
bin/ffserver
|
||||
include/ffmpeg/
|
||||
include/ffmpeg/adler32.h
|
||||
include/ffmpeg/avcodec.h
|
||||
include/ffmpeg/avdevice.h
|
||||
include/ffmpeg/avformat.h
|
||||
include/ffmpeg/avio.h
|
||||
include/ffmpeg/avstring.h
|
||||
include/ffmpeg/avutil.h
|
||||
include/ffmpeg/base64.h
|
||||
include/ffmpeg/common.h
|
||||
include/ffmpeg/crc.h
|
||||
include/ffmpeg/fifo.h
|
||||
include/ffmpeg/integer.h
|
||||
include/ffmpeg/intfloat_readwrite.h
|
||||
include/ffmpeg/log.h
|
||||
include/ffmpeg/lzo.h
|
||||
include/ffmpeg/mathematics.h
|
||||
include/ffmpeg/md5.h
|
||||
include/ffmpeg/mem.h
|
||||
include/ffmpeg/opt.h
|
||||
include/ffmpeg/random.h
|
||||
include/ffmpeg/rational.h
|
||||
include/ffmpeg/rgb2rgb.h
|
||||
include/ffmpeg/rtsp.h
|
||||
include/ffmpeg/rtspcodes.h
|
||||
include/ffmpeg/sha1.h
|
||||
include/ffmpeg/swscale.h
|
||||
include/postproc/
|
||||
include/postproc/postprocess.h
|
||||
@bin bin/ffmpeg
|
||||
@bin bin/ffplay
|
||||
@bin bin/ffserver
|
||||
include/libavcodec/
|
||||
include/libavcodec/avcodec.h
|
||||
include/libavcodec/opt.h
|
||||
include/libavdevice/
|
||||
include/libavdevice/avdevice.h
|
||||
include/libavformat/
|
||||
include/libavformat/avformat.h
|
||||
include/libavformat/avio.h
|
||||
include/libavformat/rtsp.h
|
||||
include/libavformat/rtspcodes.h
|
||||
include/libavutil/
|
||||
include/libavutil/adler32.h
|
||||
include/libavutil/avstring.h
|
||||
include/libavutil/avutil.h
|
||||
include/libavutil/base64.h
|
||||
include/libavutil/common.h
|
||||
include/libavutil/crc.h
|
||||
include/libavutil/fifo.h
|
||||
include/libavutil/intfloat_readwrite.h
|
||||
include/libavutil/log.h
|
||||
include/libavutil/lzo.h
|
||||
include/libavutil/mathematics.h
|
||||
include/libavutil/md5.h
|
||||
include/libavutil/mem.h
|
||||
include/libavutil/random.h
|
||||
include/libavutil/rational.h
|
||||
include/libavutil/sha1.h
|
||||
include/libpostproc/
|
||||
include/libpostproc/postprocess.h
|
||||
include/libswscale/
|
||||
include/libswscale/rgb2rgb.h
|
||||
include/libswscale/swscale.h
|
||||
lib/libavcodec.a
|
||||
lib/libavdevice.a
|
||||
lib/libavformat.a
|
||||
lib/libavutil.a
|
||||
lib/libpostproc.a
|
||||
lib/libswscale.a
|
||||
lib/pkgconfig/
|
||||
lib/pkgconfig/libavcodec.pc
|
||||
lib/pkgconfig/libavdevice.pc
|
||||
|
Loading…
Reference in New Issue
Block a user