pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

owntone: fix linking with binutils 2.39



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Sun Jan 1 23:59:05 2023 +0100
Changeset:	f70bb75370a120860532fa39e027ee2844e2a5dd

Modified Files:
	owntone/Makefile
	owntone/PLIST

Log Message:
owntone: fix linking with binutils 2.39

add missing library to linker command line

pkglint cleanup while here.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f70bb75370a120860532fa39e027ee2844e2a5dd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 owntone/Makefile | 22 ++++++++++++----------
 owntone/PLIST    |  3 ---
 2 files changed, 12 insertions(+), 13 deletions(-)

diffs:
diff --git a/owntone/Makefile b/owntone/Makefile
index 85384cc448..954a8fb1a4 100644
--- a/owntone/Makefile
+++ b/owntone/Makefile
@@ -12,8 +12,8 @@ LICENSE=	gnu-gpl-v2
 
 OWNTONE_USER?=	owntone
 OWNTONE_GROUP?=	owntone
-PKG_GROUPS=     $(OWNTONE_USER)
-PKG_USERS=      $(OWNTONE_USER):$(OWNTONE_GROUP)
+PKG_GROUPS=	${OWNTONE_USER}
+PKG_USERS=	${OWNTONE_USER}:${OWNTONE_GROUP}
 
 RCD_SCRIPTS=	owntone
 
@@ -21,6 +21,7 @@ RCD_SCRIPTS=	owntone
 
 GNU_CONFIGURE=	yes
 
+USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 USE_TOOLS+=	flex
 USE_TOOLS+=	bison
@@ -32,17 +33,18 @@ CONFIGURE_ARGS+=	--disable-install_systemd
 # Letting pkg-config find it didn't seem to work; and then
 # configure.ac tries to perform a link (reasonable really).
 
-LIBAV_CFLAGS+=		-I$(BUILDLINK_PREFIX.ffmpeg5)/include/ffmpeg5
-LIBAV_LIBS+=		$(BUILDLINK_PREFIX.ffmpeg5)/lib/ffmpeg5/libavformat.so
-LIBAV_LIBS+=		$(BUILDLINK_PREFIX.ffmpeg5)/lib/ffmpeg5/libavcodec.so
-LIBAV_LIBS+=		$(BUILDLINK_PREFIX.ffmpeg5)/lib/ffmpeg5/libavfilter.so
+LIBAV_CFLAGS+=		-I${BUILDLINK_PREFIX.ffmpeg5}/include/ffmpeg5
+LIBAV_LIBS+=		${BUILDLINK_PREFIX.ffmpeg5}/lib/ffmpeg5/libavformat.so
+LIBAV_LIBS+=		${BUILDLINK_PREFIX.ffmpeg5}/lib/ffmpeg5/libavcodec.so
+LIBAV_LIBS+=		${BUILDLINK_PREFIX.ffmpeg5}/lib/ffmpeg5/libavfilter.so
+LIBAV_LIBS+=		${BUILDLINK_PREFIX.ffmpeg5}/lib/ffmpeg5/libavutil.so
 # Help configure.ac find libdav1d
-LIBAV_LIBS+=		$(BUILDLINK_PREFIX.dav1d)/lib/libdav1d.so
+LIBAV_LIBS+=		${BUILDLINK_PREFIX.dav1d}/lib/libdav1d.so
 
-CONFIGURE_ENV+=		'LIBAV_CFLAGS=$(LIBAV_CFLAGS)'
-CONFIGURE_ENV+=		'LIBAV_LIBS=$(LIBAV_LIBS)'
+CONFIGURE_ENV+=		'LIBAV_CFLAGS=${LIBAV_CFLAGS}'
+CONFIGURE_ENV+=		'LIBAV_LIBS=${LIBAV_LIBS}'
 
-BUILDLINK_API_DEPENDS.libevent+=        libevent>=2.0.0
+BUILDLINK_API_DEPENDS.libevent+=	libevent>=2.0.0
 #BUILDLINK_API_DEPENDS.protobuf-c=	protbuf-c>=1.3.3nb2
 
 .include "../../net/avahi/buildlink3.mk"
diff --git a/owntone/PLIST b/owntone/PLIST
index 89841d30f3..004985443d 100644
--- a/owntone/PLIST
+++ b/owntone/PLIST
@@ -43,6 +43,3 @@ share/owntone/htdocs/index.html
 share/owntone/htdocs/mstile-150x150.png
 share/owntone/htdocs/safari-pinned-tab.svg
 share/owntone/htdocs/site.webmanifest
-@pkgdir var/run
-@pkgdir var/log
-@pkgdir var/cache/owntone


Home | Main Index | Thread Index | Old Index