pkgsrc-WIP-changes archive

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

Works complete under Slackware-current, videothumbnails now compiled in.



Module Name:	pkgsrc-wip
Committed By:	andyb <andyb%m42.one@localhost>
Pushed By:	andyb
Date:		Wed Feb 27 18:10:34 2019 +0100
Changeset:	148d8c2dc6bd29c8271db38b0f9542a1348f1cd8

Modified Files:
	spacefm/Makefile
	spacefm/TODO

Log Message:
Works complete under Slackware-current, videothumbnails now compiled in.

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

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

diffstat:
 spacefm/Makefile | 15 +++++----------
 spacefm/TODO     |  5 -----
 2 files changed, 5 insertions(+), 15 deletions(-)

diffs:
diff --git a/spacefm/Makefile b/spacefm/Makefile
index eeef9f8a41..840266962b 100644
--- a/spacefm/Makefile
+++ b/spacefm/Makefile
@@ -16,13 +16,11 @@ LICENSE=	gnu-gpl-v3
 WRKSRC=		${WRKDIR}/spacefm-1.0.6
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_LANGUAGES=	c
-
-CONFIGURE_ARGS+= --disable-video-thumbnails
+USE_LANGUAGES=	c c++
 
 USE_TOOLS+=	intltool msgfmt pkg-config automake autoconf gmake
 
-CFLAGS+=         -ludev
+CFLAGS+=	-ludev -lffmpegthumbnailer
 
 DEPENDS+=	libX11-[0-9]*:../../x11/libX11
 DEPENDS+=	hal-[0-9]*:../../sysutils/hal
@@ -30,16 +28,12 @@ DEPENDS+=	desktop-file-utils-[0-9]*:../../sysutils/desktop-file-utils
 DEPENDS+=	shared-mime-info-[0-9]*:../../databases/shared-mime-info
 DEPENDS+=	ffmpegthumbnailer-[0-9]*:../../multimedia/ffmpegthumbnailer
 
-#edit me
-export LIBUDEV_CFLAGS=	-I/usr/lib/pkgconfig/
-export LIBUDEV_LIBS=	-L/usr/lib/pkgconfig/
-#edit me
-
+export LIBUDEV_CFLAGS=	$(pkg-config --cflags libudev)
+export LIBUDEV_LIBS=	$(pkg-config --libs libudev)
 export FFMPEG_CFLAGS=   $(pkg-config --cflags libffmpegthumbnailer)
 export FFMPEG_LIBS=     $(pkg-config --libs libffmpegthumbnailer)
 
 .include "options.mk"
-.include "../../mk/bsd.pkg.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/menu-cache/buildlink3.mk"
 .include "../../sysutils/libfm/buildlink3.mk"
@@ -50,3 +44,4 @@ export FFMPEG_LIBS=     $(pkg-config --libs libffmpegthumbnailer)
 .include "../../sysutils/desktop-file-utils/buildlink3.mk"
 .include "../../databases/shared-mime-info/buildlink3.mk"
 .include "../../multimedia/ffmpegthumbnailer/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/spacefm/TODO b/spacefm/TODO
index 663361d2e8..7d1cb58e34 100644
--- a/spacefm/TODO
+++ b/spacefm/TODO
@@ -1,11 +1,6 @@
 Works only with linux at the moment, vidthumbsnails must be fixed
 Read more here
 
-#####
-You must edit in the Makefile in "wip/spacefm" between both "#edit me" lines, 
-where are yours libudev.pc file is located from yours linux package manager or
-self compiling/installation.
-#####
 ##
 Note: libudev is not in the pkgsrc-tree in the moment, you must install libudev
 your own, or with the package manager of your linux system.


Home | Main Index | Thread Index | Old Index