pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
grass: Hackily update include bl3 files when missing
Module Name: pkgsrc-wip
Committed By: Greg Troxel <gdt%lexort.com@localhost>
Pushed By: gdt
Date: Mon May 3 12:34:03 2021 -0400
Changeset: 3d39923039b428cf0e8fc256019e542e4f712ae4
Modified Files:
grass/options.mk
Log Message:
grass: Hackily update include bl3 files when missing
It remains to fix the ffmpeg option, and to resolve Mesa vs MesaLib.
However, this was failing to be processed by revbump, and wouldn't
build, so this change doesn't seem harmful.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3d39923039b428cf0e8fc256019e542e4f712ae4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
grass/options.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diffs:
diff --git a/grass/options.mk b/grass/options.mk
index 14cc3a1d0c..e7d2041831 100644
--- a/grass/options.mk
+++ b/grass/options.mk
@@ -16,7 +16,7 @@ PKG_SUGGESTED_OPTIONS+= opengl pgsql python sqlite
CONFIGURE_ARGS+= --with-ffmpeg
CONFIGURE_ARGS+= --with-ffmpeg-includes=${PREFIX}/include/libavcodec
CONFIGURE_ARGS+= --with-ffmpeg-libs=${PREFIX}/lib
-.include "../../multimedia/ffmpeg1/buildlink3.mk"
+.include "../../multimedia/ffmpeg2/buildlink3.mk"
.else
CONFIGURE_ARGS+= --without-ffmpeg
.endif
@@ -86,7 +86,7 @@ CONFIGURE_ARGS+= --without-mysql
.if !empty(PKG_OPTIONS:Mopengl)
CONFIGURE_ARGS+= --with-opengl
PLIST.opengl= yes
-.include "../../graphics/Mesa/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
.else
CONFIGURE_ARGS+= --without-opengl
.endif
Home |
Main Index |
Thread Index |
Old Index