Index | Thread | Search

From:
"Bermuda T. Cyrus" <ima@callpeter.tel>
Subject:
Re: This will compile ffmpeg again on a 7.5 vanilla system
To:
Omar Polo <op@omarpolo.com>
Cc:
Brad Smith <brad@comstyle.com>, ports@openbsd.org
Date:
Sun, 20 Oct 2024 11:39:40 +0200

Download raw body.

Thread
On Sun, Oct 20, 2024 at 10:11:49AM +0200, Omar Polo wrote:
> On 2024/10/19 21:56:10 +0200, "Bermuda T. Cyrus" <ima@callpeter.tel> wrote:
> > There seems to be a circular dependency in the graphics/ffmpeg/Makefile port.
> 
> which circular dependency?

OK, here is a diff (not done with cvs, due to security concerns), until END
The circular dependency is on -lva* which is part of that same port afaik.
At least I couldn't find it anywhere else.  With this patch I'm able to
build and run ffmpeg on Hetzner arm64's.

Also CC'ing this to ports@

-pjp


--- Makefile.old	Sun Oct 20 11:32:54 2024
+++ Makefile	Sun Oct 20 11:34:27 2024
@@ -27,8 +27,8 @@
 
 WANTLIB += SDL2 X11 Xext Xv aom ass bz2 c crypto dav1d fontconfig
 WANTLIB += freetype fribidi gsm iconv lzma m mp3lame opus pthread
-WANTLIB += sndio speex ssl theoradec theoraenc v4l2 va va-drm
-WANTLIB += va-x11 vidstab vorbis vorbisenc vpx x264 x265 xcb xcb-shape
+WANTLIB += sndio speex ssl theoradec theoraenc v4l2
+WANTLIB += vidstab vorbis vorbisenc vpx x264 x265 xcb xcb-shape
 WANTLIB += xcb-shm xcb-xfixes xml2 xvidcore z zimg
 
 COMPILER=	base-clang ports-gcc
@@ -65,20 +65,20 @@
 		textproc/libxml
 
 # inter-library dependencies for the current configuration
-LIBavcodec_EXTRALIBS=-L${LOCALBASE}/lib -L${X11BASE}/lib -laom -ldav1d -lgsm -liconv -llzma
+LIBavcodec_EXTRALIBS= -L${LOCALBASE}/libavcodec -L${LOCALBASE}/libavdevice -L${LOCALBASE}/libavfilter -L${LOCALBASE}/libavformat -L${LOCALBASE}/libavutil -L${LOCALBASE}/libpostproc -L${LOCALBASE}/libswresample -L${LOCALBASE}/libswscale -L${LOCALBASE}/lib -L${X11BASE}/lib -laom -ldav1d -lgsm -liconv -llzma
 LIBavcodec_EXTRALIBS+=-lmp3lame -lopus -lspeex -ltheoradec -ltheoraenc -lvorbis
-LIBavcodec_EXTRALIBS+=-lvorbisenc -lvpx -lx264 -lx265 -lxvidcore -lm -lz -lva
-LIBavcodec_EXTRALIBS+=-lva-drm -pthread
+LIBavcodec_EXTRALIBS+=-lvorbisenc -lvpx -lx264 -lx265 -lxvidcore -lm -lz 
+LIBavcodec_EXTRALIBS+=-lavdevice -pthread
 
-LIBavdevice_EXTRALIBS=-L${LOCALBASE}/lib -L${X11BASE}/lib -lX11 -lXext -lXv
+LIBavdevice_EXTRALIBS=-L${LOCALBASE}/libavcodec -L${LOCALBASE}/libavdevice -L${LOCALBASE}/libavfilter -L${LOCALBASE}/libavformat -L${LOCALBASE}/libavutil -L${LOCALBASE}/libpostproc -L${LOCALBASE}/libswresample -L${LOCALBASE}/libswscale -L${LOCALBASE}/lib -L${X11BASE}/lib -lX11 -lXext -lXv
 LIBavdevice_EXTRALIBS+=-lxcb-shape -lxcb-shm -lxcb-xfixes -lxcb -lsndio -lv4l2 -lm
 
 LIBavfilter_EXTRALIBS=-L${LOCALBASE}/lib -L${X11BASE}/lib -lass -lfontconfig
-LIBavfilter_EXTRALIBS+=-lfreetype -lfribidi -lvidstab -lm -lz -lzimg -lva -pthread
+LIBavfilter_EXTRALIBS+=-lfreetype -lfribidi -lvidstab -lm -lz -lzimg -pthread
 
-LIBavformat_EXTRALIBS=-L${LOCALBASE}/lib -lbz2 -lxml2 -lssl -lcrypto -lm -lz
+LIBavformat_EXTRALIBS=-L${LOCALBASE}/libavcodec -L${LOCALBASE}/libavdevice -L${LOCALBASE}/libavfilter -L${LOCALBASE}/libavformat -L${LOCALBASE}/libavutil -L${LOCALBASE}/libpostproc -L${LOCALBASE}/libswresample -L${LOCALBASE}/libswscale -L${LOCALBASE}/lib -lbz2 -lxml2 -lssl -lcrypto -lm -lz
 
-LIBavutil_EXTRALIBS=-L${X11BASE}/lib -lva -lva-drm -lva-x11 -lm -pthread
+LIBavutil_EXTRALIBS=-L${X11BASE}/lib -lavdevice -lm -pthread
 
 LIBpostproc_EXTRALIBS=-lm
 LIBswresample_EXTRALIBS=-lm


END

-pjp


> > Here is an updated Makefile.  How did you test/build this?
> > 
> > ---->
> > [...]
> > <----
> 
> please send a diff instead, it's easier to see what you're proposing to
> change.  If you got the ports tree with cvs, running `cvs diff` will
> show one.  Just save it to a file (cvs diff >/tmp/diff) and attach it to
> a mail.
> 
> See this FAQ entry about preparing diffs:
> <https://www.openbsd.org/faq/faq5.html#Diff>
> 
> Also, for what concerns ports, please use <ports@openbsd.org> instead.

-- 
{behind the name in base64}
H4sICJXqtWYAA25hbWUybnVtLmMAbU/RboJAEHy/r5hijIfQRnwU6Y8oDyccsgkc
l+OobYz/3gOq0Og+bGZnZzczC1JZ1eUS+9bm1HyUn2wxpyo6/ecy+6NlTzFSltWC
FHcAwpyzEFkpDNYOfx1Sn10Z/qpXUPwYR5mO2SQowPsXeEuw9TFd3qvQxj0puLMk
jQnhda04yx2UqCUOfU+PyvPjp0P5TZZHs8XtgTQSDF6jdFqTIzfTeCmpkuBr/coU
IUjAbVM1F2kGzTtWYuUjQPTsRAfBSxdjMM+WEqqrT9KgKcZcyxbUYpm7ZOHdaQia
hRnSbRxxY78JVrA8ygEAAA==
---