Commit 2f969e93 authored by Olivier Cochard's avatar Olivier Cochard
Browse files

multimedia/gpac: merge sub-ports and update to 2.4.0 

Consolidate gpac, mp4box and library into a single port as the upstream build
system does not easily support splitting applications from the library.

Sponsored by:	Netflix
parent 50e0098a

MOVED

+1 −0
Original line number Diff line number Diff line
@@ -5079,3 +5079,4 @@ devel/py-confusable_homoglyphs|devel/py-confusable-homoglyphs|2026-01-15|Rename 
devel/py-pyyaml_env_tag|devel/py-pyyaml-env-tag|2026-01-15|Rename to match upstream naming

www/py-aiohttp_cors|www/py-aiohttp-cors|2026-01-15|Rename to match upstream naming

lang/cython3|lang/cython|2026-01-15|Remove obsoleted port. Use lang/cython instead

multimedia/gpac-mp4box|multimedia/gpac|2026-01-15|Merge mp4box and libgpac and add gpac

multimedia/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -71,8 +71,7 @@ 
    SUBDIR += get_iplayer

    SUBDIR += gmmlib

    SUBDIR += gmp-api

    SUBDIR += gpac-libgpac

    SUBDIR += gpac-mp4box

    SUBDIR += gpac

    SUBDIR += gpodder

    SUBDIR += gst123

    SUBDIR += gstreamer1

multimedia/gpac-libgpac/Makefile

deleted100644 → 0
+0 −65
Original line number Diff line number Diff line 
PORTNAME=	gpac

DISTVERSIONPREFIX=	v

DISTVERSION=	1.0.0

PORTREVISION=	3

PORTEPOCH=	1

CATEGORIES=	multimedia

PKGNAMESUFFIX=	-libgpac



MAINTAINER=	olivier@FreeBSD.org

COMMENT=	Gpac MPEG-4 Systems library and headers

WWW=		https://gpac.sourceforge.net/



LICENSE=	LGPL21



BUILD_DEPENDS=	bash:shells/bash



ALL_TARGET=	lib

INSTALL_TARGET=	install-lib

USES=		cpe gmake dos2unix shebangfix

SHEBANG_FILES=	check_revision.sh

bash_OLD_CMD+=	/bin/sh

USE_GITHUB=	yes

HAS_CONFIGURE=	yes

USE_LDCONFIG=	yes

DOS2UNIX_FILES=	src/utils/os_config_init.c



OPTIONS_DEFINE=	IPV6 JPEG OPENGL SSL PNG XVIDEO

OPTIONS_DEFAULT=	JPEG SSL PNG



CFLAGS+=	-I${WRKSRC}/include -I${LOCALBASE}/include

LDFLAGS+=	-L${LOCALBASE}/lib



CONFIGURE_ARGS=	--prefix="${PREFIX}" --cc="${CC}" --X11-path="${LOCALBASE}" \

		--extra-cflags="${CFLAGS}" --extra-ldflags="${LDFLAGS}" \

		--static-modules \

		--enable-pic \

		--disable-wx \

		--use-js=no --use-a52=no --use-faad=no --use-ffmpeg=no \

		--use-ft=no --use-mad=no --use-ogg=no --use-xvid=no \

		--use-openjpeg=no --use-theora=no --use-vorbis=no



SSL_USES=		ssl

SSL_CONFIGURE_ENABLE=	ssl

OPENGL_USES=	gl

OPENGL_USE=	GL=gl GL=glu

OPENGL_CONFIGURE_ENABLE=3d

XVIDEO_LIB_DEPENDS=	libXv.so:x11/libXv

XVIDEO_CONFIGURE_OFF=	--disable-x11-xv --disable-x11-shm

IPV6_CONFIGURE_ENABLE=	ipv6

JPEG_USES=		jpeg

JPEG_CONFIGURE_ON=	--use-jpeg=local

JPEG_CONFIGURE_OFF=	--use-jpeg=no

PNG_LIB_DEPENDS=	libpng.so:graphics/png

PNG_CONFIGURE_ON=	--use-png=local

PNG_CONFIGURE_OFF=	--use-png=no



post-patch:

	${REINPLACE_CMD} -e 's|s/\.\*\\(\[0-9\]\\)\\+\$$/\\1/|s/^[^0-9]*//| ;\

		/CFLAGS=/s/-O3// ; s/-export-dynamic/-Wl,--export-dynamic/' \

		${WRKSRC}/configure



post-install:

	${INSTALL_DATA} ${WRKSRC}/gpac.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig



.include <bsd.port.mk>

multimedia/gpac-libgpac/distinfo

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
TIMESTAMP = 1595078627

SHA256 (gpac-gpac-v1.0.0_GH0.tar.gz) = ebcca41993e51706c891dba4e9fe03b59bc671c41910bc6c303ba3feeb7f1b20

SIZE (gpac-gpac-v1.0.0_GH0.tar.gz) = 10289999

multimedia/gpac-libgpac/files/patch-modules_x11__out_x11__out.c

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
--- modules/x11_out/x11_out.c.orig	2020-06-16 16:17:17 UTC

+++ modules/x11_out/x11_out.c

@@ -975,10 +975,14 @@ GF_Err X11_ProcessEvent (struct _video_out * vout, GF_

 		case GF_EVENT_SET_GL:

 			if (!xWindow->output_3d) return GF_OK;

 

+#ifdef GPAC_HAS_OPENGL

 			if ( ! glXMakeCurrent(xWindow->display, xWindow->fullscreen ? xWindow->full_wnd : xWindow->wnd, xWindow->glx_context) ) {

 				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[X11] Cannot make context current\n"));

 				return GF_IO_ERR;

 			}

+#else

+			return GF_NOT_SUPPORTED;

+#endif

 			break;

 		}

 	} else {