Attachment 71546 Details for Bug 104189 – file.diff

[patch] file.diff

file.diff (text/plain), 2.69 KB, created by Vladimir Kushnir on 2006-10-09 01:30:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Kushnir

Created: 2006-10-09 01:30:22 UTC

Size: 2.69 KB

patch

obsolete

>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

Actions: View | Diff

Attachments on bug 104189: 71546