Date: Mon, 9 Oct 2006 00:24:09 GMT From: Vladimir Kushnir<vkushnir@i.kiev.ua> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/104189: (patch) Enable MMX and video grabbing for ffmpeg-devel on amd64 Message-ID: <200610090024.k990O9a8045590@www.freebsd.org> Resent-Message-ID: <200610090030.k990UNXQ099110@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 104189
>Category: ports
>Synopsis: (patch) Enable MMX and video grabbing for ffmpeg-devel on amd64
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Oct 09 00:30:22 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Vladimir Kushnir
>Release: -CURRENT
>Organization:
BITP
>Environment:
FreeBSD kushnir1.kiev.ua 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Tue Oct 3 09:42:01 EEST 2006 root@kushnir1.kiev.ua:/usr/obj/usr/src/sys/KUSHNIR amd64
>Description:
Both MMX and video (bktr) grabbing in multimedia/ffmpeg-devel are marked as i386 only while both features can be enabled for amd64 as well. Patch against current port is attached.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -cr ffmpeg-devel.orig/Makefile ffmpeg-devel/Makefile
*** ffmpeg-devel.orig/Makefile Mon Oct 9 01:36:11 2006
--- ffmpeg-devel/Makefile Mon Oct 9 02:27:43 2006
***************
*** 105,111 ****
##
## arch detection
##
! .if ${ARCH} != "i386"
WITHOUT_MMX= yes
.else
#EXTRA_PATCHES+= ${FILESDIR}/extra-bktr-patch-libavformat::Makefile
--- 105,111 ----
##
## arch detection
##
! .if (${ARCH} != "i386") && (${ARCH} != "amd64")
WITHOUT_MMX= yes
.else
#EXTRA_PATCHES+= ${FILESDIR}/extra-bktr-patch-libavformat::Makefile
***************
*** 115,121 ****
WITH_BUILTIN_VECTOR= yes
.endif
# !i386 does not like bktr
! .if ${ARCH} != "i386"
CONFIGURE_ARGS+= --disable-bktr
.endif
--- 115,121 ----
WITH_BUILTIN_VECTOR= yes
.endif
# !i386 does not like bktr
! .if (${ARCH} != "i386") && (${ARCH} != "amd64")
CONFIGURE_ARGS+= --disable-bktr
.endif
***************
*** 443,449 ****
@${ECHO_MSG} 'Define WITH_XVID to enable XVID codec'
@${ECHO_MSG}
.endif
! .if ${ARCH} == "i386"
. ifndef(WITH_VIDEO_CAPTURE)
@${ECHO_MSG} 'Define WITH_VIDEO_CAPTURE to enable bktr(4) driver'
@${ECHO_MSG} 'video capture'
--- 443,449 ----
@${ECHO_MSG} 'Define WITH_XVID to enable XVID codec'
@${ECHO_MSG}
.endif
! .if (${ARCH} == "i386") || (${ARCH} == "amd64")
. ifndef(WITH_VIDEO_CAPTURE)
@${ECHO_MSG} 'Define WITH_VIDEO_CAPTURE to enable bktr(4) driver'
@${ECHO_MSG} 'video capture'
***************
*** 489,495 ****
-e 's|^(texi2html=)no|\1yes|' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
.endif
! .if ${ARCH} == "i386"
.ifdef(WITH_VIDEO_CAPTURE)
# set proper audio device
.ifdef(WITH_AUDIO_DEV)
--- 489,495 ----
-e 's|^(texi2html=)no|\1yes|' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
.endif
! .if (${ARCH} == "i386") || (${ARCH} == "amd64")
.ifdef(WITH_VIDEO_CAPTURE)
# set proper audio device
.ifdef(WITH_AUDIO_DEV)
***************
*** 500,511 ****
.ifdef(WITH_BKTR_DEV)
@${REINPLACE_CMD} -E \
-e "s!idev = 0!idev = ${WITH_BKTR_DEV}!" \
! ${WRKSRC}/libavformat/grab_bsdbktr.c
.endif
.ifdef(WITH_BKTR_FORMAT)
@${REINPLACE_CMD} -E \
-e "s!VIDEO_FORMAT NTSC!VIDEO_FORMAT ${WITH_BKTR_FORMAT}!" \
! ${WRKSRC}/libavformat/grab_bsdbktr.c
.endif
.endif # WITH_VIDEO_CAPTURE
.endif # ${ARCH} == i386
--- 500,511 ----
.ifdef(WITH_BKTR_DEV)
@${REINPLACE_CMD} -E \
-e "s!idev = 0!idev = ${WITH_BKTR_DEV}!" \
! ${WRKSRC}/libavformat/grab_bktr.c
.endif
.ifdef(WITH_BKTR_FORMAT)
@${REINPLACE_CMD} -E \
-e "s!VIDEO_FORMAT NTSC!VIDEO_FORMAT ${WITH_BKTR_FORMAT}!" \
! ${WRKSRC}/libavformat/grab_bktr.c
.endif
.endif # WITH_VIDEO_CAPTURE
.endif # ${ARCH} == i386
Only in ffmpeg-devel/files: patch-libavformat::grab_bktr.c
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200610090024.k990O9a8045590>