On Wed, Dec 23, 2020 at 11:48:25AM -0500, Brad Smith wrote:
> On 12/23/2020 11:01 AM, Brad Smith wrote:
> > I definitely did not see that. But I also had both 5.1 and 5.2 installed
> > and it was picking
> > up 5.2 over 5.1. If the build needs or is expected to pick up 5.1 over
> > 5.2 then it might
> > need some further tweaking.
>
> Looking?? at luajit?? ONLY_FOR_ARCHS = powerpc i386 amd64
> so this needs further tweaking. The commit below would break mpv on other
> archs.
> mpv builds on more than just those 3 archs. WAF should probably be made to
> pickup
> a particular release instead of scanning through and picking up whatever
> happens to
> be installed and not luajit.
>
> > On 12/23/2020 9:09 AM, Rafael Sadowski wrote:
> > > CVSROOT:?????? /cvs
> > > Module name:?????? ports
> > > Changes by:?????? [email protected]?????? 2020/12/23 07:09:38
> > >
> > > Modified files:
> > > ????????multimedia/mpv : Makefile
> > >
> > > Log message:
> > > Unbreak mpv 0.33.0
> > >
> > > Add missing dependency on libluajit-5.1. Error:
> > >
> > > ld.so: mpv: can't load library 'libluajit-5.1.so.1.0'
> > >
> > > Spotted by Tim van der Molen, thanks
Here.. now it is not picking up 5.2 on my system.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/multimedia/mpv/Makefile,v
retrieving revision 1.67
diff -u -p -u -p -r1.67 Makefile
--- Makefile 23 Dec 2020 14:09:38 -0000 1.67
+++ Makefile 23 Dec 2020 16:43:39 -0000
@@ -5,7 +5,7 @@ COMMENT = movie player based on MPlayer
GH_ACCOUNT = mpv-player
GH_PROJECT = mpv
GH_TAGNAME = v0.33.0
-REVISION = 0
+REVISION = 1
SHARED_LIBS += mpv 0.2 # 1.107
@@ -26,9 +26,9 @@ WANTLIB += Xinerama Xrandr Xrender Xss X
WANTLIB += avcodec avdevice avfilter avformat avresample avutil
WANTLIB += bluray c cdio cdio_cdda cdio_paranoia drm dvdnav dvdread
WANTLIB += epoxy expat fontconfig freetype fribidi gbm glib-2.0
-WANTLIB += graphite2 harfbuzz iconv intl jpeg lcms2 ${MODLUA_WANTLIB} m pcre
-WANTLIB += placebo postproc pthread swresample swscale xcb xcb-dri2
-WANTLIB += luajit-5.1 xcb-glx xml2 z
+WANTLIB += graphite2 harfbuzz iconv intl jpeg lcms2 ${MODLUA_WANTLIB}
+WANTLIB += m pcre placebo postproc pthread swresample swscale xcb
+WANTLIB += xcb-dri2 xcb-glx xml2 z
MODULES = lang/lua \
lang/python
@@ -53,8 +53,7 @@ LIB_DEPENDS = archivers/libarchive \
graphics/libplacebo \
multimedia/libass \
multimedia/libbluray \
- multimedia/libdvdnav \
- lang/luajit
+ multimedia/libdvdnav
MODPY_RUNDEP = No
RUN_DEPENDS = devel/desktop-file-utils \
@@ -65,6 +64,7 @@ CONFIGURE_ARGS = --confloaddir=${SYSCONF
--confdir=${LOCALBASE}/share/examples/mpv \
--mandir=${LOCALBASE}/man \
--docdir=${LOCALBASE}/share/examples/mpv \
+ --lua="${MODLUA_DEP_VERSION}obsd" \
--enable-cdda \
--enable-dvdnav \
--enable-libmpv-shared \
