diff options
| author | wg <wg@FreeBSD.org> | 2013-10-16 21:06:17 +0800 |
|---|---|---|
| committer | wg <wg@FreeBSD.org> | 2013-10-16 21:06:17 +0800 |
| commit | 78cc857c2f624946d7a3b418cefedb50a87c55e4 (patch) | |
| tree | 8cd1f87304ed81af310fbc582d22d3a871ec5860 /multimedia | |
| parent | 895aff24444351a44e5a270d0cc316bc97f36c99 (diff) | |
| download | freebsd-ports-gnome-78cc857c2f624946d7a3b418cefedb50a87c55e4.tar.gz freebsd-ports-gnome-78cc857c2f624946d7a3b418cefedb50a87c55e4.tar.zst freebsd-ports-gnome-78cc857c2f624946d7a3b418cefedb50a87c55e4.zip | |
multimedia/gmerlin-avdecoder: fix pkg-plist
- Fix pkg-plist with non-default options
- Fix detection of libs
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/gmerlin-avdecoder/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/gmerlin-avdecoder/pkg-plist | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile index 961e9c74b641..847e40d11ce1 100644 --- a/multimedia/gmerlin-avdecoder/Makefile +++ b/multimedia/gmerlin-avdecoder/Makefile @@ -30,8 +30,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-cpuflags=none --without-doxygen USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include/ffmpeg0 -LDFLAGS+= -L${LOCALBASE}/lib/ffmpeg0 +CPPFLAGS+= -I${LOCALBASE}/include/ffmpeg0 -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib/ffmpeg0 -L${LOCALBASE}/lib .include <bsd.port.options.mk> diff --git a/multimedia/gmerlin-avdecoder/pkg-plist b/multimedia/gmerlin-avdecoder/pkg-plist index 2e93f58dee1c..61ea94ba47e5 100644 --- a/multimedia/gmerlin-avdecoder/pkg-plist +++ b/multimedia/gmerlin-avdecoder/pkg-plist @@ -5,12 +5,12 @@ include/gmerlin/bgavdefs.h include/gmerlin/bgav_version.h %%GMERLIN%%lib/gmerlin/plugins/i_avdec.la %%GMERLIN%%lib/gmerlin/plugins/i_avdec.so -%%CDIO%%%%DVDREAD%%lib/gmerlin/plugins/i_dvd.la -%%CDIO%%%%DVDREAD%%lib/gmerlin/plugins/i_dvd.so -lib/gmerlin/plugins/i_dvb.la -lib/gmerlin/plugins/i_dvb.so -%%CDIO%%lib/gmerlin/plugins/i_vcd.la -%%CDIO%%lib/gmerlin/plugins/i_vcd.so +%%GMERLIN%%%%CDIO%%%%DVDREAD%%lib/gmerlin/plugins/i_dvd.la +%%GMERLIN%%%%CDIO%%%%DVDREAD%%lib/gmerlin/plugins/i_dvd.so +%%GMERLIN%%lib/gmerlin/plugins/i_dvb.la +%%GMERLIN%%lib/gmerlin/plugins/i_dvb.so +%%GMERLIN%%%%CDIO%%lib/gmerlin/plugins/i_vcd.la +%%GMERLIN%%%%CDIO%%lib/gmerlin/plugins/i_vcd.so lib/libgmerlin_avdec.la lib/libgmerlin_avdec.so lib/libgmerlin_avdec.so.1 @@ -18,4 +18,6 @@ libdata/pkgconfig/gmerlin_avdec.pc %%PORTDOCS%%%%DOCSDIR%%/README share/locale/de/LC_MESSAGES/gmerlin-avdecoder.mo %%PORTDOCS%%@dirrm %%DOCSDIR%% +%%GMERLIN%%@dirrmtry lib/gmerlin/plugins +%%GMERLIN%%@dirrmtry lib/gmerlin @dirrmtry include/gmerlin |