Buildlink glu and MesaLib with 'x11' option to fix build, at least on

macOS, and restore PLIST decorations to fix packaging on macOS.

multimedia/gpac/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2020/01/05 04:11:15 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.8 2020/09/19 03:14:16 schmonz Exp $
 bin/DashCast
 bin/MP42TS
 bin/MP4Box
@@ -104,40 +104,40 @@ include/gpac/xml.h
 include/win32/inttypes.h
 include/win32/stdint.h
 include/wince/errno.h
-lib/gpac/gm_aac_in.so
-lib/gpac/gm_ac3_in.so
-lib/gpac/gm_amr_in.so
-lib/gpac/gm_atsc_in.so
-lib/gpac/gm_audio_filter.so
-lib/gpac/gm_bifs_dec.so
-lib/gpac/gm_ctx_load.so
-lib/gpac/gm_dummy_in.so
-lib/gpac/gm_ffmpeg_in.so
-lib/gpac/gm_ft_font.so
-lib/gpac/gm_img_in.so
-lib/gpac/gm_ismacryp.so
-lib/gpac/gm_isom_in.so
-lib/gpac/gm_laser_dec.so
-lib/gpac/gm_mp3_in.so
-lib/gpac/gm_mpd_in.so
-lib/gpac/gm_mpegts_in.so
-lib/gpac/gm_netctrl.so
-lib/gpac/gm_odf_dec.so
-lib/gpac/gm_ogg_xiph.so
-lib/gpac/gm_osd.so
-lib/gpac/gm_oss_audio.so
-lib/gpac/gm_pulseaudio.so
-lib/gpac/gm_raw_out.so
-lib/gpac/gm_rtp_in.so
-lib/gpac/gm_saf_in.so
-lib/gpac/gm_soft_raster.so
-lib/gpac/gm_svg_in.so
-lib/gpac/gm_timedtext.so
-lib/gpac/gm_validator.so
-lib/gpac/gm_vtt_in.so
-lib/gpac/gm_widgetman.so
-lib/gpac/gm_x11_out.so
-lib/gpac/gm_xvid_dec.so
+lib/gpac/gm_aac_in.${LIBEXT}
+lib/gpac/gm_ac3_in.${LIBEXT}
+lib/gpac/gm_amr_in.${LIBEXT}
+lib/gpac/gm_atsc_in.${LIBEXT}
+lib/gpac/gm_audio_filter.${LIBEXT}
+lib/gpac/gm_bifs_dec.${LIBEXT}
+lib/gpac/gm_ctx_load.${LIBEXT}
+lib/gpac/gm_dummy_in.${LIBEXT}
+lib/gpac/gm_ffmpeg_in.${LIBEXT}
+lib/gpac/gm_ft_font.${LIBEXT}
+lib/gpac/gm_img_in.${LIBEXT}
+lib/gpac/gm_ismacryp.${LIBEXT}
+lib/gpac/gm_isom_in.${LIBEXT}
+lib/gpac/gm_laser_dec.${LIBEXT}
+lib/gpac/gm_mp3_in.${LIBEXT}
+lib/gpac/gm_mpd_in.${LIBEXT}
+lib/gpac/gm_mpegts_in.${LIBEXT}
+lib/gpac/gm_netctrl.${LIBEXT}
+lib/gpac/gm_odf_dec.${LIBEXT}
+lib/gpac/gm_ogg_xiph.${LIBEXT}
+lib/gpac/gm_osd.${LIBEXT}
+${PLIST.oss}lib/gpac/gm_oss_audio.${LIBEXT}
+lib/gpac/gm_pulseaudio.${LIBEXT}
+lib/gpac/gm_raw_out.${LIBEXT}
+lib/gpac/gm_rtp_in.${LIBEXT}
+lib/gpac/gm_saf_in.${LIBEXT}
+lib/gpac/gm_soft_raster.${LIBEXT}
+lib/gpac/gm_svg_in.${LIBEXT}
+lib/gpac/gm_timedtext.${LIBEXT}
+lib/gpac/gm_validator.${LIBEXT}
+lib/gpac/gm_vtt_in.${LIBEXT}
+lib/gpac/gm_widgetman.${LIBEXT}
+${PLIST.x11}lib/gpac/gm_x11_out.${LIBEXT}
+lib/gpac/gm_xvid_dec.${LIBEXT}
 lib/libgpac.so
 lib/libgpac.so.8
 lib/libgpac.so.8.0.0

multimedia/gpac/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2017/07/22 13:07:04 adam Exp $
+# $NetBSD: options.mk,v 1.2 2020/09/19 03:14:16 schmonz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gpac
 PKG_SUPPORTED_OPTIONS=	x11
@@ -9,6 +9,8 @@ PKG_SUGGESTED_OPTIONS=	x11
 .if !empty(PKG_OPTIONS:Mx11)
 CONFIGURE_ARGS+=	--X11-path=${X11BASE}
 PLIST.x11=		yes
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXv/buildlink3.mk"
 .endif