[RFC] Test ffmpeg-devel amd64 patches
Vladimir Kushnir
vkushnir at i.kiev.ua
Tue Dec 6 15:11:40 PST 2005
AND (Re: ffmpeg-devel & amd64) :-)
On Tue, 6 Dec 2005, Mario Sergio Fujikawa Ferreira wrote:
> Hi,
>
> I wrote some patches for ffmpeg-devel that
> supposedly would get it to work on amd64 boxes.
> I cannot verify that the patches are correct since I
> do not have a amd64 box.
>
> Could someone test these patches on amd64 boxes?
> Also, if you could help fixing any bugs you find, that would be
> optimal. :)
>
> The modified port
>
> http://people.FreeBSD.org/~lioux/ffmpeg-devel.tgz
>
Just a wee bit more to make it work (patches attached). Anyway - thanks
for keeping it up with bleeding edge ffmpeg.
Regards,
Vladimir
-------------- next part --------------
diff -rc /home/vkushnir/ffmpeg-devel/Makefile ffmpeg-devel/Makefile
*** /home/vkushnir/ffmpeg-devel/Makefile Tue Dec 6 06:25:53 2005
--- ffmpeg-devel/Makefile Wed Dec 7 00:38:42 2005
***************
*** 434,440 ****
@${ECHO_MSG} 'Define WITH_VORBIS 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'
--- 434,440 ----
@${ECHO_MSG} 'Define WITH_VORBIS 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'
***************
*** 457,463 ****
post-extract:
.if ${ARCH} == "i386"
# install booktree extension
! # @${CP} ${FILESDIR}/grab_bsdbktr.c ${WRKSRC}/libavformat/
.endif # ${ARCH} == i386
# -e 's@%%PIE%%@-pie@' \
--- 457,463 ----
post-extract:
.if ${ARCH} == "i386"
# install booktree extension
! # @${CP} ${FILESDIR}/grab_bktr.c ${WRKSRC}/libavformat/
.endif # ${ARCH} == i386
# -e 's@%%PIE%%@-pie@' \
***************
*** 502,508 ****
-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)
--- 502,508 ----
-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)
***************
*** 513,524 ****
.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
--- 513,524 ----
.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
***************
*** 584,595 ****
--- 584,605 ----
@${ECHO_CMD} '#define HAVE_LRINTF' >> ${WRKSRC}/config.h
.endif
.ifdef(WITH_DTS)
+ .if ${ARCH} == "amd64"
+ @${REINPLACE_CMD} -E \
+ -e 's|-ldts|${LOCALBASE}/lib/libdts_pic.a|' \
+ -e 's|(-lx264)|-L${LOCALBASE}/lib \1|' \
+ ${WRKSRC}/config.h \
+ ${WRKSRC}/config.mak \
+ ${WRKSRC}/libavcodec/Makefile
+ .else
@${REINPLACE_CMD} -E \
-e 's|-ldts|${LOCALBASE}/lib/libdts.a|' \
-e 's|(-lx264)|-L${LOCALBASE}/lib \1|' \
${WRKSRC}/config.mak \
${WRKSRC}/libavcodec/Makefile
.endif
+ .endif
+
.ifndef(WITH_THEORA)
@${REINPLACE_CMD} -E \
-e 's|^(CONFIG_LIBTHEORA).*$$|\1=no|' \
Only in /home/vkushnir/ffmpeg-devel: Makefile.orig
Only in ffmpeg-devel/files: patch-libavformat::grab_bktr.c
More information about the freebsd-ports
mailing list