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

Remove a hack for FFmpeg/Libav to workaround an assembler bug now that it

Browse Source 
has been fixed.

ok ajacoutot@
This commit is contained in:
brad 2013-01-20 07:46:16 +00:00
parent afce5c1c41
commit 63a5ba9eb2
6 changed files with 6 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/ffmpeg/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.93 2013/01/16 01:02:03 brad Exp $
# $OpenBSD: Makefile,v 1.94 2013/01/20 07:46:16 brad Exp $
COMMENT= audio/video converter and streamer
V= 20121026
DISTNAME= ffmpeg-git-${V}
PKGNAME= ffmpeg-${V}
REVISION= 0
REVISION= 1
CATEGORIES= graphics multimedia
MASTER_SITES= http://comstyle.com/source/
EXTRACT_SUFX= .tar.xz

12
graphics/ffmpeg/patches/patch-libavcodec_x86_vp56_arith_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libavcodec_x86_vp56_arith_h,v 1.1 2011/03/29 20:01:43 edd Exp $
--- libavcodec/x86/vp56_arith.h.orig Mon Mar 7 00:53:24 2011
+++ libavcodec/x86/vp56_arith.h Mon Mar 7 00:53:48 2011
@@ -24,7 +24,7 @@
#ifndef AVCODEC_X86_VP56_ARITH_H
#define AVCODEC_X86_VP56_ARITH_H
-#if HAVE_FAST_CMOV
+#if HAVE_FAST_CMOV && !ARCH_X86_64
#define vp56_rac_get_prob vp56_rac_get_prob
static av_always_inline int vp56_rac_get_prob(VP56RangeCoder *c, uint8_t prob)
{

3
multimedia/gstreamer1/plugins-libav/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.8 2013/01/08 13:50:12 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.9 2013/01/20 07:46:16 brad Exp $
COMMENT= ffmpeg elements for GStreamer
V= 1.0.5
DISTNAME= gst-libav-${V}
PKGNAME= ${GST_PKGNAME_PREFIX}-plugins-libav-${V}
REVISION= 0
# sync with graphics/ffmpeg
PERMIT_PACKAGE_CDROM= patents

12
multimedia/gstreamer1/plugins-libav/patches/patch-gst-libs_ext_libav_libavcodec_x86_vp56_arith_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gst-libs_ext_libav_libavcodec_x86_vp56_arith_h,v 1.1.1.1 2012/09/15 12:24:16 ajacoutot Exp $
--- gst-libs/ext/libav/libavcodec/x86/vp56_arith.h.orig Fri Sep 14 03:43:38 2012
+++ gst-libs/ext/libav/libavcodec/x86/vp56_arith.h Fri Sep 14 10:57:43 2012
@@ -24,7 +24,7 @@
#ifndef AVCODEC_X86_VP56_ARITH_H
#define AVCODEC_X86_VP56_ARITH_H
-#if HAVE_FAST_CMOV
+#if HAVE_FAST_CMOV && !ARCH_X86_64
#define vp56_rac_get_prob vp56_rac_get_prob
static av_always_inline int vp56_rac_get_prob(VP56RangeCoder *c, uint8_t prob)
{

4
www/chromium/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.120 2013/01/19 12:06:51 sthen Exp $
# $OpenBSD: Makefile,v 1.121 2013/01/20 07:46:16 brad Exp $
ONLY_FOR_ARCHS= i386 amd64
@ -6,7 +6,7 @@ COMMENT= Chromium browser
V= 24.0.1312.52
DISTNAME= chromium-${V}
REVISION= 0
REVISION= 1
CATEGORIES= www

12
www/chromium/patches/patch-third_party_ffmpeg_libavcodec_x86_vp56_arith_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-third_party_ffmpeg_libavcodec_x86_vp56_arith_h,v 1.2 2013/01/18 21:38:02 robert Exp $
--- third_party/ffmpeg/libavcodec/x86/vp56_arith.h.orig Mon Jan 14 19:53:31 2013
+++ third_party/ffmpeg/libavcodec/x86/vp56_arith.h Tue Jan 15 08:44:30 2013
@@ -24,7 +24,7 @@
#ifndef AVCODEC_X86_VP56_ARITH_H
#define AVCODEC_X86_VP56_ARITH_H
-#if HAVE_INLINE_ASM && HAVE_FAST_CMOV
+#if HAVE_INLINE_ASM && HAVE_FAST_CMOV && !ARCH_X86_64
#define vp56_rac_get_prob vp56_rac_get_prob
static av_always_inline int vp56_rac_get_prob(VP56RangeCoder *c, uint8_t prob)
{