Index: Mk/Uses/meson.mk =================================================================== --- /dev/null +++ Mk/Uses/meson.mk @@ -0,0 +1,74 @@ +# $FreeBSD$ +# +# Provide support for Meson based projects +# +# Feature: meson +# Usage: USES=meson +# +# The following files are bundled in source tar files. +# meson.build - Instructions for meson like autoconf configure, +# there is no changeable parts in the file. +# meson_options.txt - All the options meson understands +# +# Variables for ports: +# MESON_ARGS - Arguments passed to meson +# format: -Denable_foo=true +# MESON_ENV - +# MESON_BUILD_DIR - Path to the build directory +# Default: ${WRKSRC}/_build +# +# MAINTAINER: gnome@FreeBSD.org + +# XXX not too sure what to do with this yet +#WARNING: You are using 'US-ASCII' which is not a a Unicode-compatible locale. +#WARNING: You might see errors if you use UTF-8 strings as filenames, as strings, or as file contents. +#WARNING: Please switch to a UTF-8 locale for your platform. +#The Meson build system +#Version: 0.39.0 + +.if !defined(_INCLUDE_USES_MESON_MK) +_INCLUDE_USES_MESON_MK= yes + +# Sanity check +.if !empty(meson_ARGS) +IGNORE= Incorrect 'USES+= meson:${meson_ARGS}'. meson takes no arguments +.endif + +BUILD_DEPENDS+= meson:devel/meson + +# meson uses ninja +.include "${USESDIR}/ninja.mk" + +CONFIGURE_ARGS+= --prefix ${PREFIX} \ + --mandir man + +# meson has it own strip mechanic +INSTALL_TARGET= install + +# should we have strip separate from WITH_DEBUG? +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --buildtype debug +.else +CONFIGURE_ARGS+= --buildtype release \ + --strip +.endif + +HAS_CONFIGURE= yes +CONFIGURE_CMD= meson +# Pull in manual set settings and from options +CONFIGURE_ARGS+= ${MESON_ARGS} +CONFIGURE_ENV+= ${MESON_ENV} + +BUILD_WRKSRC= ${WRKSRC}/${MESON_BUILD_DIR} + +INSTALL_WRKSRC= ${WRKSRC}/${MESON_BUILD_DIR} + +TEST_WRKSRC= ${WRKSRC}/${MESON_BUILD_DIR} +TEST_TARGET= test + +MESON_BUILD_DIR?= _build + +# Add meson build dir at the end. +CONFIGURE_ARGS+= ${MESON_BUILD_DIR} + +.endif #!defined(_INCLUDE_USES_MESON_MK) Index: Mk/bsd.options.mk =================================================================== --- Mk/bsd.options.mk +++ Mk/bsd.options.mk @@ -112,6 +112,18 @@ # ${opt}_QMAKE_OFF When option is disabled, it will add its content to # the QMAKE_ARGS. # +# ${opt}_MESON_ON When option is enabled, it will add its +# content to MESON_ARGS. +# ${opt}_MESON_OFF When option is disabled, it will add its +# content to MESON_ARGS. +# +# ${opt}_MESON_TRUE Will add to MESON_ARGS: +# Option enabled --${content} true +# Option disabled --${content} false +# ${opt}_MESON_FALSE Will add to MESON_ARGS: +# Option enabled --${content} false +# Option disabled --${content} true +# # ${opt}_IMPLIES When opt is enabled, options named in IMPLIES will # get enabled too. # ${opt}_PREVENTS When opt is enabled, if any options in PREVENTS are @@ -521,7 +533,13 @@ . if defined(${opt}_CMAKE_BOOL_OFF) CMAKE_ARGS+= ${${opt}_CMAKE_BOOL_OFF:C/.*/-D&:BOOL=false/} . endif -. for configure in CONFIGURE CMAKE QMAKE +. if defined(${opt}_MESON_TRUE) +MESON_ARGS+= ${${opt}_MESON_TRUE:C/.*/-D&=true/} +. endif +. if defined(${opt}_MESON_TRUE_OFF) +MESON_ARGS+= ${${opt}_MESON_TRUE_OFF:C/.*/-D&=false/} +. endif +. for configure in CONFIGURE CMAKE MESON QMAKE . if defined(${opt}_${configure}_ON) ${configure}_ARGS+= ${${opt}_${configure}_ON} . endif @@ -571,7 +589,13 @@ . if defined(${opt}_CMAKE_BOOL_OFF) CMAKE_ARGS+= ${${opt}_CMAKE_BOOL_OFF:C/.*/-D&:BOOL=true/} . endif -. for configure in CONFIGURE CMAKE QMAKE +. if defined(${opt}_MESON_FALSE) +MESON_ARGS+= ${${opt}_MESON_FALSE:C/.*/-D&=false/} +. endif +. if defined(${opt}_MESON_FALSE_OFF) +MESON_ARGS+= ${${opt}_MESON_FALSE_OFF:C/.*/-D&=true/} +. endif +. for configure in CONFIGURE CMAKE MESON QMAKE . if defined(${opt}_${configure}_OFF) ${configure}_ARGS+= ${${opt}_${configure}_OFF} . endif Index: graphics/Makefile =================================================================== --- graphics/Makefile +++ graphics/Makefile @@ -296,6 +296,7 @@ SUBDIR += gracula SUBDIR += grads SUBDIR += grafx2 + SUBDIR += graphene SUBDIR += graphite2 SUBDIR += graphopt SUBDIR += graphos Index: graphics/graphene/Makefile =================================================================== --- /dev/null +++ graphics/graphene/Makefile @@ -0,0 +1,33 @@ +# $FreeBSD$ + +PORTNAME= graphene +PORTVERSION= 1.6.0 +CATEGORIES= graphics devel +MASTER_SITES= GNOME + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Optimizations for speeding up vector operations + +LICENSE= MIT + +USES= gnome meson pkgconfig python:3 libtool tar:xz +USE_GNOME= glib20 py3gobject3 + +OPTIONS_SUB= yes +OPTIONS_DEFINE= GTKDOC #INTROSPECTION +#OPTIONS_DEFAULT=INTROSPECTION + +USE_GNOME+= introspection:build +#INTROSPECTION_DESC= Build Gobject Introspection +#INTROSPECTION_USE= gnome=introspection:build +#INTROSPECTION_MESON_OFF= -Denable-introspection=false + +#GTKDOC_MESON_ON= -Denable-gtk-doc=true +GTKDOC_MESON_TRUE= enable-gtk-doc +GTKDOC_DESC= Build documentation + +# I don't know why suddenly the tests are installed, so half-ass solution for now +post-install: + @${RM} -rf ${STAGEDIR}${PREFIX}/libexec/installed-tests + +.include Index: graphics/graphene/distinfo =================================================================== --- /dev/null +++ graphics/graphene/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1491756916 +SHA256 (graphene-1.6.0.tar.xz) = c3a9910f8dd298c1459d1f3c699ddf2e7440f9e561bfcbef59ae784400e27b5d +SIZE (graphene-1.6.0.tar.xz) = 421228 Index: graphics/graphene/pkg-descr =================================================================== --- /dev/null +++ graphics/graphene/pkg-descr @@ -0,0 +1,16 @@ +Graphene contains optimizations for speeding up vector operations; those +optimizations are optional, and used only if both Graphene was compiled +with support for them and if the system you're running on has them. +Currently, Graphene supports the following platform-specific fast paths: + +Streaming SIMD Extensions (SSE) 2 +ARM NEON +GCC vector extensions +In the remote case in which none of these optimizations are available, +Graphene will fall back to a naïve scalar implementation + +Graphene can, optionally, provide types for integrating with GObject +properties and signals, as well as introspection information for its +use with other languages through introspection-based bindings. + +WWW: http://ebassi.github.io/graphene/ Index: graphics/graphene/pkg-plist =================================================================== --- /dev/null +++ graphics/graphene/pkg-plist @@ -0,0 +1,75 @@ +include/graphene-1.0/graphene-box.h +include/graphene-1.0/graphene-euler.h +include/graphene-1.0/graphene-frustum.h +include/graphene-1.0/graphene-gobject.h +include/graphene-1.0/graphene-macros.h +include/graphene-1.0/graphene-matrix.h +include/graphene-1.0/graphene-plane.h +include/graphene-1.0/graphene-point.h +include/graphene-1.0/graphene-point3d.h +include/graphene-1.0/graphene-quad.h +include/graphene-1.0/graphene-quaternion.h +include/graphene-1.0/graphene-ray.h +include/graphene-1.0/graphene-rect.h +include/graphene-1.0/graphene-simd4f.h +include/graphene-1.0/graphene-simd4x4f.h +include/graphene-1.0/graphene-size.h +include/graphene-1.0/graphene-sphere.h +include/graphene-1.0/graphene-triangle.h +include/graphene-1.0/graphene-types.h +include/graphene-1.0/graphene-vec2.h +include/graphene-1.0/graphene-vec3.h +include/graphene-1.0/graphene-vec4.h +include/graphene-1.0/graphene-version-macros.h +include/graphene-1.0/graphene-version.h +include/graphene-1.0/graphene.h +lib/girepository-1.0/Graphene-1.0.typelib +lib/graphene-1.0/include/graphene-config.h +lib/libgraphene-1.0.so +lib/libgraphene-1.0.so.0 +lib/libgraphene-1.0.so.0.600.0 +lib/pkgconfig/graphene-1.0.pc +lib/pkgconfig/graphene-gobject-1.0.pc +share/gir-1.0/Graphene-1.0.gir +%%GTKDOC%%share/gtk-doc/html/graphene/annotation-glossary.html +%%GTKDOC%%share/gtk-doc/html/graphene/api-index.html +%%GTKDOC%%share/gtk-doc/html/graphene/ch01.html +%%GTKDOC%%share/gtk-doc/html/graphene/deprecated-api-index.html +%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Box.html +%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Euler.html +%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Frustum.html +%%GTKDOC%%share/gtk-doc/html/graphene/graphene-GObject-integration.html +%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Matrix.html +%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Plane.html +%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Point.html +%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Point3D.html +%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Quad.html +%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Quaternion.html +%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Ray.html +%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Rectangle.html +%%GTKDOC%%share/gtk-doc/html/graphene/graphene-SIMD-matrix.html +%%GTKDOC%%share/gtk-doc/html/graphene/graphene-SIMD-vector.html +%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Size.html +%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Sphere.html +%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Triangle.html +%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Vectors.html +%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Versioning-information.html +%%GTKDOC%%share/gtk-doc/html/graphene/graphene.devhelp2 +%%GTKDOC%%share/gtk-doc/html/graphene/home.png +%%GTKDOC%%share/gtk-doc/html/graphene/index.html +%%GTKDOC%%share/gtk-doc/html/graphene/ix03.html +%%GTKDOC%%share/gtk-doc/html/graphene/ix04.html +%%GTKDOC%%share/gtk-doc/html/graphene/ix05.html +%%GTKDOC%%share/gtk-doc/html/graphene/ix06.html +%%GTKDOC%%share/gtk-doc/html/graphene/left-insensitive.png +%%GTKDOC%%share/gtk-doc/html/graphene/left.png +%%GTKDOC%%share/gtk-doc/html/graphene/object-tree.html +%%GTKDOC%%share/gtk-doc/html/graphene/rectangle-intersection.png +%%GTKDOC%%share/gtk-doc/html/graphene/rectangle-union.png +%%GTKDOC%%share/gtk-doc/html/graphene/rectangle.png +%%GTKDOC%%share/gtk-doc/html/graphene/right-insensitive.png +%%GTKDOC%%share/gtk-doc/html/graphene/right.png +%%GTKDOC%%share/gtk-doc/html/graphene/style.css +%%GTKDOC%%share/gtk-doc/html/graphene/triangle-barycentric.png +%%GTKDOC%%share/gtk-doc/html/graphene/up-insensitive.png +%%GTKDOC%%share/gtk-doc/html/graphene/up.png Index: multimedia/gstreamer1/Makefile =================================================================== --- multimedia/gstreamer1/Makefile +++ multimedia/gstreamer1/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= gstreamer -PORTVERSION= 1.8.0 -PORTREVISION= 1 +PORTVERSION= 1.11.90 CATEGORIES= multimedia MASTER_SITES= http://gstreamer.freedesktop.org/src/gstreamer/ PKGNAMESUFFIX= 1 @@ -17,29 +16,19 @@ PORTSCOUT= limitw:1,even CFLAGS:= ${CFLAGS} -O2 -Wno-format -USES= bison gettext gmake libtool pathfix pkgconfig tar:xz +USES= bison gettext meson pkgconfig tar:xz USE_GNOME= glib20 introspection:build -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-tests \ - --disable-examples \ - --disable-failing-tests \ - --disable-fatal-warnings \ - --disable-gtk-doc -CONFIGURE_ENV= ac_cv_func_register_printf_function="no" -INSTALL_TARGET= install-strip + +MESON_ARGS+= -Ddisable_gtkdoc=true + +# XXX introspection build breaks.. +MESON_ARGS+= -Ddisable_introspection=true + PLIST_SUB= VERSION=${GST10_VERSION} \ - SOVERSION=0.800.0 + SOVERSION=0.1190.0 USE_LDCONFIG= yes GST10_VERSION= 1.0 -OPTIONS_SUB= yes -OPTIONS_DEFINE= LIBCHECK -LIBCHECK_DESC= Unit tests support -LIBCHECK_CONFIGURE_ENABLE= check -LIBCHECK_LIB_DEPENDS= libcheck.so:devel/check - -post-patch: - @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \ - ${WRKSRC}/configure +PLIST_SUB+= LIBCHECK="" .include Index: multimedia/gstreamer1/distinfo =================================================================== --- multimedia/gstreamer1/distinfo +++ multimedia/gstreamer1/distinfo @@ -1,2 +1,3 @@ -SHA256 (gstreamer-1.8.0.tar.xz) = 947a314a212b5d94985d89b43440dbe66b696e12bbdf9a2f78967b98d74abedc -SIZE (gstreamer-1.8.0.tar.xz) = 3616276 +TIMESTAMP = 1492335127 +SHA256 (gstreamer-1.11.90.tar.xz) = a99a2487d81164be205f9a6f48f802decf1665cc05ae3d7b122a7f00e82e3330 +SIZE (gstreamer-1.11.90.tar.xz) = 3143812 Index: multimedia/gstreamer1/pkg-plist =================================================================== --- multimedia/gstreamer1/pkg-plist +++ multimedia/gstreamer1/pkg-plist @@ -1,6 +1,5 @@ bin/gst-inspect-%%VERSION%% bin/gst-launch-%%VERSION%% -bin/gst-stats-%%VERSION%% bin/gst-typefind-%%VERSION%% include/gstreamer-%%VERSION%%/gst/base/base.h include/gstreamer-%%VERSION%%/gst/base/gstadapter.h @@ -29,6 +28,7 @@ include/gstreamer-%%VERSION%%/gst/controller/gstdirectcontrolbinding.h include/gstreamer-%%VERSION%%/gst/controller/gstinterpolationcontrolsource.h include/gstreamer-%%VERSION%%/gst/controller/gstlfocontrolsource.h +include/gstreamer-%%VERSION%%/gst/controller/gstproxycontrolbinding.h include/gstreamer-%%VERSION%%/gst/controller/gsttimedvaluecontrolsource.h include/gstreamer-%%VERSION%%/gst/controller/gsttriggercontrolsource.h include/gstreamer-%%VERSION%%/gst/glib-compat.h @@ -45,6 +45,7 @@ include/gstreamer-%%VERSION%%/gst/gstchildproxy.h include/gstreamer-%%VERSION%%/gst/gstclock.h include/gstreamer-%%VERSION%%/gst/gstcompat.h +include/gstreamer-%%VERSION%%/gst/gstconfig.h include/gstreamer-%%VERSION%%/gst/gstcontext.h include/gstreamer-%%VERSION%%/gst/gstcontrolbinding.h include/gstreamer-%%VERSION%%/gst/gstcontrolsource.h @@ -54,6 +55,7 @@ include/gstreamer-%%VERSION%%/gst/gstdevicemonitor.h include/gstreamer-%%VERSION%%/gst/gstdeviceprovider.h include/gstreamer-%%VERSION%%/gst/gstdeviceproviderfactory.h +include/gstreamer-%%VERSION%%/gst/gstdynamictypefactory.h include/gstreamer-%%VERSION%%/gst/gstelement.h include/gstreamer-%%VERSION%%/gst/gstelementfactory.h include/gstreamer-%%VERSION%%/gst/gstelementmetadata.h @@ -84,6 +86,8 @@ include/gstreamer-%%VERSION%%/gst/gstregistry.h include/gstreamer-%%VERSION%%/gst/gstsample.h include/gstreamer-%%VERSION%%/gst/gstsegment.h +include/gstreamer-%%VERSION%%/gst/gststreamcollection.h +include/gstreamer-%%VERSION%%/gst/gststreams.h include/gstreamer-%%VERSION%%/gst/gststructure.h include/gstreamer-%%VERSION%%/gst/gstsystemclock.h include/gstreamer-%%VERSION%%/gst/gsttaglist.h @@ -115,7 +119,6 @@ %%LIBCHECK%%lib/girepository-1.0/GstCheck-%%VERSION%%.typelib lib/girepository-1.0/GstController-%%VERSION%%.typelib lib/girepository-1.0/GstNet-%%VERSION%%.typelib -lib/gstreamer-%%VERSION%%/include/gst/gstconfig.h lib/gstreamer-%%VERSION%%/libgstcoreelements.so lib/gstreamer-%%VERSION%%/libgstcoretracers.so lib/libgstbase-%%VERSION%%.so @@ -133,21 +136,15 @@ lib/libgstreamer-%%VERSION%%.so lib/libgstreamer-%%VERSION%%.so.0 lib/libgstreamer-%%VERSION%%.so.%%SOVERSION%% -libdata/pkgconfig/gstreamer-%%VERSION%%.pc -libdata/pkgconfig/gstreamer-base-%%VERSION%%.pc -%%LIBCHECK%%libdata/pkgconfig/gstreamer-check-%%VERSION%%.pc -libdata/pkgconfig/gstreamer-controller-%%VERSION%%.pc -libdata/pkgconfig/gstreamer-net-%%VERSION%%.pc +lib/pkgconfig/gstreamer-%%VERSION%%.pc +lib/pkgconfig/gstreamer-base-%%VERSION%%.pc +%%LIBCHECK%%lib/pkgconfig/gstreamer-check-%%VERSION%%.pc +lib/pkgconfig/gstreamer-controller-%%VERSION%%.pc +lib/pkgconfig/gstreamer-net-%%VERSION%%.pc libexec/gstreamer-%%VERSION%%/gst-plugin-scanner -@(,,7755) libexec/gstreamer-%%VERSION%%/gst-ptp-helper man/man1/gst-inspect-%%VERSION%%.1.gz man/man1/gst-launch-%%VERSION%%.1.gz man/man1/gst-typefind-%%VERSION%%.1.gz -share/aclocal/gst-element-check-%%VERSION%%.m4 -share/bash-completion/completions/gst-inspect-%%VERSION%% -share/bash-completion/completions/gst-launch-%%VERSION%% -share/bash-completion/helpers/gst -share/bash-completion/helpers/gst-completion-helper-%%VERSION%% share/gir-1.0/Gst-%%VERSION%%.gir share/gir-1.0/GstBase-%%VERSION%%.gir %%LIBCHECK%%share/gir-1.0/GstCheck-%%VERSION%%.gir