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

- Fix generated libavcodec pkgc-config file for static linking.

Browse Source 
- sync distinfo.

ok sthen@
This commit is contained in:
brad 2013-01-08 10:13:13 +00:00
parent 32c9cbaa4e
commit ec1e74d43d
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
graphics/ffmpeg/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.90 2012/09/12 08:15:57 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.91 2013/01/08 10:13:13 brad Exp $
COMMENT= audio/video converter and streamer COMMENT= audio/video converter and streamer
V= 20120610 V= 20120610
DISTNAME= ffmpeg-git-${V} DISTNAME= ffmpeg-git-${V}
PKGNAME= ffmpeg-${V} PKGNAME= ffmpeg-${V}
REVISION= 1 REVISION= 2
CATEGORIES= graphics multimedia CATEGORIES= graphics multimedia
MASTER_SITES= http://comstyle.com/source/ MASTER_SITES= http://comstyle.com/source/
EXTRACT_SUFX= .tar.xz EXTRACT_SUFX= .tar.xz
@ -49,7 +49,7 @@ LIB_DEPENDS= archivers/bzip2 \
multimedia/xvidcore multimedia/xvidcore
# inter-library dependencies for the current configuration # inter-library dependencies for the current configuration
LIBavcodec_EXTRALIBS=-L${LOCALBASE}/lib -lgsm -lmp3lame -logg -lorc-0.4 -lschroedinger-1.0 -lspeex -ltheoradec -ltheoraenc -lvorbis -lvorbisenc -lvpx -lx264 -lxvidcore -lz -pthread LIBavcodec_EXTRALIBS=-L${LOCALBASE}/lib -lgsm -lmp3lame -lschroedinger-1.0 -lspeex -ltheoradec -ltheoraenc -lvorbis -lvorbisenc -lvpx -lx264 -lxvidcore -lz -pthread
LIBavdevice_EXTRALIBS=-L${X11BASE}/lib -lX11 -lXext -lXfixes -lsndio LIBavdevice_EXTRALIBS=-L${X11BASE}/lib -lX11 -lXext -lXfixes -lsndio
LIBavfilter_EXTRALIBS= LIBavfilter_EXTRALIBS=
LIBavformat_EXTRALIBS=-L${LOCALBASE}/lib -lbz2 LIBavformat_EXTRALIBS=-L${LOCALBASE}/lib -lbz2
@ -114,6 +114,13 @@ CONFIGURE_ENV+= LIBavcodec_EXTRALIBS="${LIBavcodec_EXTRALIBS}" \
LIBavutil_LINKFLAGS="" \ LIBavutil_LINKFLAGS="" \
LIBpostproc_LINKFLAGS="" \ LIBpostproc_LINKFLAGS="" \
LIBswscale_LINKFLAGS="" \ LIBswscale_LINKFLAGS="" \
LIBavcodec_REQUIRES="libavutil schroedinger-1.0 speex theoraenc vpx x264" \
LIBavdevice_REQUIRES="libavformat libavcodec libavutil" \
LIBavfilter_REQUIRES="libavformat libavcodec libavutil libswscale" \
LIBavformat_REQUIRES="libavcodec libavutil" \
LIBavutil_REQUIRES="" \
LIBpostproc_REQUIRES="libavutil" \
LIBswscale_REQUIRES="libavutil" \
TMPDIR=${WRKTMP} TMPDIR=${WRKTMP}
VERSION_FLAGS= libavcodec_VERSION=${LIBavcodec_VERSION} \ VERSION_FLAGS= libavcodec_VERSION=${LIBavcodec_VERSION} \

3
graphics/ffmpeg/distinfo
View File

@ -1,5 +1,2 @@
MD5 (ffmpeg-git-20120610.tar.xz) = fojkQYjfltCkB64Dno0S2Q==
RMD160 (ffmpeg-git-20120610.tar.xz) = L6y6WtGiuSGGLKS3jnbUJL7YrAU=
SHA1 (ffmpeg-git-20120610.tar.xz) = Vbnei8rK0eMdjWiIXATCGPGO5Lk=
SHA256 (ffmpeg-git-20120610.tar.xz) = XyT1cT6ziGWTu1mXmUN+jjz+yCswetXg97YhSccznBE= SHA256 (ffmpeg-git-20120610.tar.xz) = XyT1cT6ziGWTu1mXmUN+jjz+yCswetXg97YhSccznBE=
SIZE (ffmpeg-git-20120610.tar.xz) = 3854696 SIZE (ffmpeg-git-20120610.tar.xz) = 3854696

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

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.31 2012/09/12 08:15:57 ajacoutot Exp $ $OpenBSD: patch-configure,v 1.32 2013/01/08 10:13:13 brad Exp $
--- configure.orig Sun Jun 10 00:59:57 2012 --- configure.orig Sun Jun 10 00:59:57 2012
+++ configure Tue Sep 11 22:47:01 2012 +++ configure Tue Nov 20 06:31:14 2012
@@ -1092,7 +1092,6 @@ HAVE_LIST=" @@ -1092,7 +1092,6 @@ HAVE_LIST="
lzo1x_999_compress lzo1x_999_compress
machine_ioctl_bt848_h machine_ioctl_bt848_h
@ -74,10 +74,10 @@ $OpenBSD: patch-configure,v 1.31 2012/09/12 08:15:57 ajacoutot Exp $
-pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" -pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs"
-pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION" "" "libavutil = $LIBAVUTIL_VERSION" -pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"
-pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION" -pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION"
+pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "$LIBavutil_EXTRALIBS" "" "$LIBavutil_LINKFLAGS" +pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "$LIBavutil_EXTRALIBS" "$LIBavutil_REQUIRES" "$LIBavutil_LINKFLAGS"
+pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$LIBavcodec_EXTRALIBS" "libavutil" "$LIBavcodec_LINKFLAGS" +pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$LIBavcodec_EXTRALIBS" "$LIBavcodec_REQUIRES" "$LIBavcodec_LINKFLAGS"
+pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$LIBavformat_EXTRALIBS" "libavcodec libavutil" "$LIBavformat_LINKFLAGS" +pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$LIBavformat_EXTRALIBS" "$LIBavformat_REQUIRES" "$LIBavformat_LINKFLAGS"
+pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$LIBavdevice_EXTRALIBS" "libavformat libavcodec libavutil" "$LIBavdevice_LINKFLAGS" +pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$LIBavdevice_EXTRALIBS" "$LIBavdevice_REQUIRES" "$LIBavdevice_LINKFLAGS"
+pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$LIBavfilter_EXTRALIBS" "libavformat libavcodec libavutil libswscale" "$LIBavfilter_LINKFLAGS" +pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$LIBavfilter_EXTRALIBS" "$LIBavfilter_REQUIRES" "$LIBavfilter_LINKFLAGS"
+pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION" "$LIBpostproc_EXTRALIBS" "libavutil" "$LIBpostproc_LINKFLAGS" +pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION" "$LIBpostproc_EXTRALIBS" "$LIBpostproc_REQUIRES" "$LIBpostproc_LINKFLAGS"
+pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBswscale_EXTRALIBS" "libavutil" "$LIBswscale_LINKFLAGS" +pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBswscale_EXTRALIBS" "$LIBswscale_REQUIRES" "$LIBswscale_LINKFLAGS"