Attachment 220947 Details for Bug 252062 – updated patch

[patch] updated patch

libyuv-aarch64-0.0.1741-rev1.diff (text/plain), 5.00 KB, created by Steve Wills on 2020-12-26 13:42:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2020-12-26 13:42:52 UTC

Size: 5.00 KB

patch

obsolete

>diff --git graphics/libyuv/Makefile graphics/libyuv/Makefile
>index 91038f7d4cb2..11b6e2281c2c 100644
>--- graphics/libyuv/Makefile
>+++ graphics/libyuv/Makefile
>@@ -1,21 +1,50 @@
> # Created by: Corey Smith <corsmith@gmail.com>
> # $FreeBSD$
>+#
>+# To update the port:
>+# The stable libyuv version follows the chromium browser:
>+# https://chromereleases.googleblog.com/search/label/Desktop%20Update
>+# search for "The stable channel has been updated to" XX.X.XXXX.XXX
>+#  -> https://github.com/chromium/chromium/blob/87.0.4280.88/DEPS
>+#     -> 'src/third_party/libyuv': '6afd9becdf58822b1da6770598d8597c583ccfad'
>+# https://chromium.googlesource.com/libyuv/libyuv/+/6afd9becdf58822b1da6770598d8597c583ccfad/include/libyuv/version.h
>+#  -> #define LIBYUV_VERSION 1741
> 
> PORTNAME=	libyuv
>-DISTVERSION=	0.0.1280
>+DISTVERSION=	0.0.1741
> CATEGORIES=	graphics
>-MASTER_SITES=	http://files.freeswitch.org/downloads/libs/
>+MASTER_SITES=	LOCAL/mikael/libyuv/:libyuv
>+DISTFILES=	libyuv-${LIBYUV_HASH}.tar.gz:libyuv
> 
> MAINTAINER=	corsmith@gmail.com
> COMMENT=	Library for freeswitch yuv graphics manipulation
> 
> LICENSE=	BSD3CLAUSE
> 
>-BROKEN_aarch64=		Fails to compile: undefined reference to SplitUVRow_NEON
>-BROKEN_armv7=		Fails to compile: undefined reference to SplitUVRow_NEON
>+USES=		cmake pkgconfig
>+USE_LDCONFIG=	yes
>+SUB_FILES=	libyuv.pc
>+SUB_LIST=	DISTVERSION=${DISTVERSION}
> 
>-MAKE_JOBS_UNSAFE=	yes
>-CXXFLAGS+=		-fPIC
>-USE_LDCONFIG=		yes
>+LIBYUV_HASH=	6afd9becdf58822b1da6770598d8597c583ccfad
>+
>+# sha256 changes everytime you download the archive, need to host it on freefall
>+# To download the distfile: as mikael: make MAINTAINER_MODE=yes fetch
>+.if defined(MAINTAINER_MODE)
>+do-fetch:
>+	${FETCH_CMD} -o ${DISTDIR}/libyuv-${LIBYUV_HASH}.tar.gz \
>+		https://chromium.googlesource.com/libyuv/libyuv.git/+archive/${LIBYUV_HASH}.tar.gz
>+
>+. if ${USER} == ${MAINTAINER:C/@.*//}
>+    scp ${DISTDIR}/libyuv-${LIBYUV_HASH} freefall.freebsd.org:public_distfiles/libyuv
>+. endif
>+.endif # defined(MAINTAINER_MODE)
>+
>+do-extract:
>+	${MKDIR} ${WRKSRC}
>+	${TAR} -xf ${DISTDIR}/libyuv-${LIBYUV_HASH}.tar.gz  -C ${WRKSRC}
>+
>+post-install:
>+	(cd ${WRKDIR} && ${INSTALL_DATA} libyuv.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig)
> 
> .include <bsd.port.mk>
>diff --git graphics/libyuv/distinfo graphics/libyuv/distinfo
>index 50e5a0533500..e43a200cf3a8 100644
>--- graphics/libyuv/distinfo
>+++ graphics/libyuv/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (libyuv-0.0.1280.tar.gz) = 97a30b87cbea5a35222cc1071ecb78562245b7c457baa26f41beba8af85861ef
>-SIZE (libyuv-0.0.1280.tar.gz) = 297636
>+TIMESTAMP = 1608825632
>+SHA256 (libyuv-6afd9becdf58822b1da6770598d8597c583ccfad.tar.gz) = c70f9ca62b217e509f9b72961f95d921362e33fb6cca66e223b030d88ba8629f
>+SIZE (libyuv-6afd9becdf58822b1da6770598d8597c583ccfad.tar.gz) = 453451
>diff --git graphics/libyuv/files/libyuv.pc.in graphics/libyuv/files/libyuv.pc.in
>new file mode 100644
>index 000000000000..bbd2c43db798
>--- /dev/null
>+++ graphics/libyuv/files/libyuv.pc.in
>@@ -0,0 +1,11 @@
>+prefix=%%LOCALBASE%%
>+exec_prefix=${prefix}
>+libdir=${exec_prefix}/lib
>+includedir=${exec_prefix}/include
>+
>+Name: libyuv
>+Description: YUV conversion and scaling functionality library
>+Version: %%DISTVERSION%%
>+Cflags: -I${includedir}
>+Libs: -L${libdir} -lyuv
>+Libs.private: -ljpeg
>diff --git graphics/libyuv/files/patch-Makefile graphics/libyuv/files/patch-Makefile
>deleted file mode 100644
>index 66a0e5a868c0..000000000000
>--- graphics/libyuv/files/patch-Makefile
>+++ /dev/null
>@@ -1,26 +0,0 @@
>---- Makefile.orig	2015-06-19 22:04:28 UTC
>-+++ Makefile
>-@@ -1,9 +1,9 @@
>- # This is a generic makefile for libyuv for gcc.
>- # make -f linux.mk CXX=clang++
>- 
>--PREFIX:=/usr
>- EXEC_PREFIX:=$(PREFIX)
>- LIBDIR:=$(PREFIX)/lib/
>-+LIBDATA:=$(PREFIX)/libdata/
>- INCDIR:=$(PREFIX)/include/
>- 
>- CXX?=g++
>-@@ -63,10 +63,10 @@ install: libyuv.a libyuv.so libyuv.pc
>- 	install -d -m 755 $(DESTDIR)/$(LIBDIR)
>- 	install -d -m 755 $(DESTDIR)/$(INCDIR)
>- 	install -d -m 755 $(DESTDIR)/$(INCDIR)/libyuv
>--	install -d -m 755 $(DESTDIR)/$(LIBDIR)/pkgconfig
>-+	install -d -m 755 $(DESTDIR)/$(LIBDATA)/pkgconfig
>- 	install -m 644 libyuv.a $(DESTDIR)/$(LIBDIR)
>- 	install -m 644 libyuv.so $(DESTDIR)/$(LIBDIR)
>--	install -m 644 libyuv.pc $(DESTDIR)/$(LIBDIR)/pkgconfig
>-+	install -m 644 libyuv.pc $(DESTDIR)/$(LIBDATA)/pkgconfig
>- 	install -m 644 include/libyuv.h $(DESTDIR)/$(INCDIR)
>- 	install -m 644 include/libyuv/* $(DESTDIR)/$(INCDIR)/libyuv
>- 
>diff --git graphics/libyuv/pkg-plist graphics/libyuv/pkg-plist
>index dadff1558ed5..9360c46c0744 100644
>--- graphics/libyuv/pkg-plist
>+++ graphics/libyuv/pkg-plist
>@@ -1,15 +1,19 @@
>+bin/yuvconvert
> include/libyuv.h
> include/libyuv/basic_types.h
> include/libyuv/compare.h
>+include/libyuv/compare_row.h
> include/libyuv/convert.h
> include/libyuv/convert_argb.h
> include/libyuv/convert_from.h
> include/libyuv/convert_from_argb.h
> include/libyuv/cpu_id.h
>+include/libyuv/macros_msa.h
> include/libyuv/mjpeg_decoder.h
> include/libyuv/planar_functions.h
> include/libyuv/rotate.h
> include/libyuv/rotate_argb.h
>+include/libyuv/rotate_row.h
> include/libyuv/row.h
> include/libyuv/scale.h
> include/libyuv/scale_argb.h

Flags:

swills: maintainer-approval? (corsmith)

Actions: View | Diff

Attachments on bug 252062: 220832 | 220833 | 220837 | 220845 | 220853 | 220908 | 220947