diff -ur /export/home/alp/srcs/tests/oi-userland/components/encumbered/vlc/Makefile ./Makefile --- /export/home/alp/srcs/tests/oi-userland/components/encumbered/vlc/Makefile 2015-12-22 07:53:41.512257425 +0300 +++ ./Makefile 2015-12-24 01:53:32.327246390 +0300 @@ -35,12 +35,11 @@ include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk -# Lua plugin requires backward compatibility with 5.1 -CFLAGS+= -DLUA_COMPAT_ALL=1 # Required OpenGL extensions CFLAGS+= -DGL_GLEXT_PROTOTYPES # Define to ensure consistency CFLAGS+= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +CXXFLAGS+= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 # Use libjpeg-turbo LIBJPEG_PREFIX=/usr/lib/libjpeg6-turbo CFLAGS+= -I/usr/include/libjpeg6-turbo -Wl,-L$(LIBJPEG_PREFIX)/lib -Wl,-R$(LIBJPEG_PREFIX)/lib @@ -56,7 +55,7 @@ CONFIGURE_OPTIONS += --enable-httpd CONFIGURE_OPTIONS += --enable-vlm CONFIGURE_OPTIONS += --enable-addonmanagermodules -CONFIGURE_OPTIONS += --disable-live55 +CONFIGURE_OPTIONS += --disable-live555 CONFIGURE_OPTIONS += --disable-dc1394 CONFIGURE_OPTIONS += --disable-dv1394 CONFIGURE_OPTIONS += --disable-linsys @@ -112,7 +111,7 @@ CONFIGURE_OPTIONS += --enable-libmpeg2 CONFIGURE_OPTIONS += --enable-vorbis CONFIGURE_OPTIONS += --enable-speex -CONFIGURE_OPTIONS += --disable-opus +CONFIGURE_OPTIONS += --enable-opus CONFIGURE_OPTIONS += --enable-theora CONFIGURE_OPTIONS += --enable-schroedinger CONFIGURE_OPTIONS += --enable-png diff -ur /export/home/alp/srcs/tests/oi-userland/components/encumbered/vlc/vlc.p5m ./vlc.p5m --- /export/home/alp/srcs/tests/oi-userland/components/encumbered/vlc/vlc.p5m 2015-12-22 07:53:41.513515140 +0300 +++ ./vlc.p5m 2015-12-24 00:59:47.683314260 +0300 @@ -28,6 +28,12 @@ default restart_fmri svc:/application/desktop-cache/icon-cache:default> default facet.locale.%<\1> true> + add pkg.depend.bypass-generate libGL\.so\.1> + add pkg.depend.bypass-generate libjpeg\.so\..*> + +depend fmri=service/opengl/ogl-select type=require +depend fmri=pkg:/image/library/libjpeg6-turbo@1.4.2-2015.0.2.0 type=require + file path=usr/bin/cvlc file path=usr/bin/qvlc file path=usr/bin/rvlc @@ -264,6 +270,7 @@ file path=usr/lib/vlc/plugins/codec/libjpeg_plugin.so file path=usr/lib/vlc/plugins/codec/liblibass_plugin.so file path=usr/lib/vlc/plugins/codec/liblibmpeg2_plugin.so +file path=usr/lib/vlc/plugins/codec/libopus_plugin.so file path=usr/lib/vlc/plugins/codec/liblpcm_plugin.so file path=usr/lib/vlc/plugins/codec/libmpeg_audio_plugin.so file path=usr/lib/vlc/plugins/codec/libpng_plugin.so