<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6debd48bb7592223f8bfb1a58631f9653253d7b1">https://github.com/macports/macports-ports/commit/6debd48bb7592223f8bfb1a58631f9653253d7b1</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6debd48bb75 libmovit: update to 1.7.0, fix broken port
</span>6debd48bb75 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6debd48bb7592223f8bfb1a58631f9653253d7b1
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Wed Aug 2 05:01:51 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> libmovit: update to 1.7.0, fix broken port
</span>---
multimedia/libmovit/Portfile | 66 +++++++++++++---------
multimedia/libmovit/files/color.130.frag | 11 ++++
multimedia/libmovit/files/color.150.frag | 11 ++++
.../libmovit/files/patch-make_bundled_shaders.diff | 31 ++++++++++
multimedia/libmovit/files/patch-no-features_h.diff | 8 +--
multimedia/libmovit/files/patch-nolibrt.diff | 12 ++--
multimedia/libmovit/files/patch-notests.diff | 18 +++---
multimedia/libmovit/files/patch-opengl.diff | 11 ++++
multimedia/libmovit/files/vs-color.130.vert | 17 ++++++
multimedia/libmovit/files/vs-color.150.vert | 17 ++++++
10 files changed, 155 insertions(+), 47 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libmovit/Portfile b/multimedia/libmovit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 61fe2faf127..ea19f6a73b6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libmovit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libmovit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,9 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup conflicts_build 1.0
</span>
name libmovit
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.5.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.7.0
</span>
categories multimedia
platforms darwin linux
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,32 +20,41 @@ master_sites ${homepage}
</span>
distname movit-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ce29a03233672ada255400a1041381a89acd3b6a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ead191d717dbefbe914260ed0335cf04a7dfc6fde8f23293c5ca7f88e45ace81
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b625f7199d130f460eebec1b0dcb4a8c86a66039 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 23597b93ea53762d44df763ecc2b702308f76fc17382099e9385220081ce6610 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 606989
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+installs_libs yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-make_bundled_shaders.diff
</span>
depends_lib-append path:share/pkgconfig/eigen3.pc:eigen3 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fftw-3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libepoxy \
</span> port:libpng
<span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2014
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # the current port:gtest is out-of-date, doesn't install everything required
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # and it will thus break our build.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ autoreconf.args -fvi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span> depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fftw-3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libepoxy \
</span> port:libsdl2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsdl2_image
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl2_image \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mesa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libX11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-extract {
file delete -force ${worksrcpath}/libtool
}
patchfiles-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-no-features_h.diff \
</span> patch-nolibrt.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-notests.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- autoreconf.args -fvi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-notests.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-opengl.diff
</span> }
platform linux {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,21 +63,22 @@ platform linux {
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/lib/libmovit.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/vs-color.130.vert ${destroot}${prefix}/share/movit/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/vs-color.150.vert ${destroot}${prefix}/share/movit/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/color.130.frag ${destroot}${prefix}/share/movit/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/color.150.frag ${destroot}${prefix}/share/movit/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${prefix}/share/movit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach frag [glob ${worksrcpath}/*.frag] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${frag} ${destroot}${prefix}/share/movit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach vert [glob ${worksrcpath}/*.vert] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${vert} ${destroot}${prefix}/share/movit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach check {vs-color.130.vert vs-color.150.vert color.130.frag color.150.frag} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${destroot}${prefix}/share/movit/${check}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "Installing missing ${check}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${filespath}/${check} ${destroot}${prefix}/share/movit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "movit-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant installdemo description "Install Demo Application" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-no-features_h.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
reinplace "s|\"\.\"|\"${prefix}/share/movit/\"|g" ${worksrcpath}/demo.cpp
reinplace "s|\"blg_wheels_woman_1.jpg\"|\"/Users/Shared/blg_wheels_woman_1.jpg\"|g" ${worksrcpath}/demo.cpp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,5 +96,6 @@ variant installdemo description "Install Demo Application" {
</span> ***** The demo program generates a number of working files,
***** so I suggest you run it from within a folder you can delete.
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex "movit-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libmovit/files/color.130.frag b/multimedia/libmovit/files/color.130.frag
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d546844b5fb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libmovit/files/color.130.frag
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#version 130
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in vec2 tc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in vec4 frag_color;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+out vec4 FragColor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+void main()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FragColor = frag_color;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libmovit/files/color.150.frag b/multimedia/libmovit/files/color.150.frag
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9d3d2db25a4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libmovit/files/color.150.frag
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#version 150
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in vec2 tc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in vec4 frag_color;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+out vec4 FragColor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+void main()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FragColor = frag_color;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libmovit/files/patch-make_bundled_shaders.diff b/multimedia/libmovit/files/patch-make_bundled_shaders.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b1f6623635c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libmovit/files/patch-make_bundled_shaders.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 61799c1d01e79b7d203cf2c89798aa567a341aba Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: "Steinar H. Gunderson" <sgunderson@bigfoot.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 22 Jul 2023 18:45:44 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix an off-by-one in shader bundle generation.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Non-ASCII characters would inadvertently become two bytes instead of one,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+which would (for shaders after that in the bundle) give the wrong offsets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+and thus potentially corrupted shaders.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Normally, this wouldn't really be noticed since the first things are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+comments and the lasts are #undef, but in some cases, the shader
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compilers would complain on suspicious things.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reported by Stefano Rivera, who also provided a test system for debugging.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ make_bundled_shaders.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/make_bundled_shaders.cpp b/make_bundled_shaders.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 53ce13f..225d084 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- make_bundled_shaders.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ make_bundled_shaders.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,7 +54,7 @@ int main(int argc, char **argv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (ch == '\\') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf("\\\\");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (!isprint(ch)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- printf("\\0%o", ch);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf("\\%o", ch);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf("%c", ch);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libmovit/files/patch-no-features_h.diff b/multimedia/libmovit/files/patch-no-features_h.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 04bdb282824..4d01fe35da8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libmovit/files/patch-no-features_h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libmovit/files/patch-no-features_h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig.demo.cpp 2017-03-21 19:40:17.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ demo.cpp 2017-04-30 14:12:53.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,7 +25,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- demo.cpp 2023-07-15 23:41:56.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ demo.cpp 2023-07-25 13:33:59.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,7 +14,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <SDL2/SDL_video.h>
</span>
#include <assert.h>
+#ifndef __APPLE__
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libmovit/files/patch-nolibrt.diff b/multimedia/libmovit/files/patch-nolibrt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3283da3070c..df319c1179e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libmovit/files/patch-nolibrt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libmovit/files/patch-nolibrt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig.Makefile.in 2017-03-21 19:40:17.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in 2017-04-30 14:14:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,7 +29,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in 2023-07-15 23:41:56.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in 2023-07-25 13:31:15.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,7 +28,7 @@
</span> LDFLAGS=@LDFLAGS@
LDLIBS=@epoxy_LIBS@ @FFTW3_LIBS@ -lpthread
<span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_LDLIBS=@epoxy_LIBS@ @SDL2_LIBS@ @SDL_LIBS@ -lpthread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DEMO_LDLIBS=@SDL2_image_LIBS@ @SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+DEMO_LDLIBS=@SDL2_image_LIBS@ @SDL_image_LIBS@ -lpthread @libpng_LIBS@ @FFTW3_LIBS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TEST_LDLIBS=@epoxy_LIBS@ @SDL2_LIBS@ @benchmark_LIBS@ -lpthread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DEMO_LDLIBS=@SDL2_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DEMO_LDLIBS=@SDL2_image_LIBS@ -lpthread @libpng_LIBS@ @FFTW3_LIBS@
</span> SHELL=@SHELL@
LIBTOOL=@LIBTOOL@ --tag=CXX
RANLIB=ranlib
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libmovit/files/patch-notests.diff b/multimedia/libmovit/files/patch-notests.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 002059cc5e3..1abce75c7c9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libmovit/files/patch-notests.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libmovit/files/patch-notests.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig.Makefile.in 2017-03-21 19:40:17.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in 2017-04-30 14:14:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -93,7 +93,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIB_OBJS=effect_util.o util.o effect.o effect_chain.o init.o resource_pool.o fp16.o ycbcr.o $(INPUTS:=.o) $(EFFECTS:=.o)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in 2023-07-15 23:41:56.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in 2023-07-25 13:39:39.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,7 +92,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIB_OBJS=effect_util.o util.o effect.o effect_chain.o init.o resource_pool.o ycbcr.o bundled_shaders.o $(INPUTS:=.o) $(EFFECTS:=.o)
</span>
# Default target:
-all: libmovit.la $(TESTS)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,14 +9,14 @@
</span>
ifeq ($(with_demo_app),yes)
all: demo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -112,8 +112,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -111,8 +111,8 @@
</span> $(TESTS): %: %.o $(TEST_OBJS) libmovit.la
$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $^ $(TEST_LDLIBS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--OWN_OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(OWN_TEST_OBJS) $(TESTS:=.o)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(TEST_OBJS) $(TESTS:=.o)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+OWN_OBJS=$(DEMO_OBJS) $(LIB_OBJS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+OBJS=$(DEMO_OBJS) $(LIB_OBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-OWN_OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(OWN_TEST_OBJS) $(TESTS:=.o) make_bundled_shaders.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(TEST_OBJS) $(TESTS:=.o) make_bundled_shaders.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OWN_OBJS=$(DEMO_OBJS) $(LIB_OBJS) make_bundled_shaders.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OBJS=$(DEMO_OBJS) $(LIB_OBJS) make_bundled_shaders.o
</span>
# A small demo program.
demo: libmovit.la $(DEMO_OBJS)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libmovit/files/patch-opengl.diff b/multimedia/libmovit/files/patch-opengl.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..72a867f5f0c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libmovit/files/patch-opengl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in 2023-07-15 23:41:56.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in 2023-07-25 14:06:59.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -183,7 +183,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # A program to compile all the shaders into one bundle that we can link into the library.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKE_BUNDLE_OBJS=make_bundled_shaders.o util.o init.o resource_pool.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ make_bundled_shaders: $(MAKE_BUNDLE_OBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o make_bundled_shaders $(MAKE_BUNDLE_OBJS) -lepoxy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o make_bundled_shaders $(MAKE_BUNDLE_OBJS) -lepoxy -framework OpenGL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bundled_shaders.cpp: make_bundled_shaders $(SHADERS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ./make_bundled_shaders $(SHADERS) > $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libmovit/files/vs-color.130.vert b/multimedia/libmovit/files/vs-color.130.vert
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2f46e2c6b70
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libmovit/files/vs-color.130.vert
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#version 130
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in vec2 position;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in vec4 color;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+out vec4 frag_color;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+void main()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // The result of glOrtho(0.0, 1.0, 0.0, 1.0, 0.0, 1.0) is:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // 2.000 0.000 0.000 -1.000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // 0.000 2.000 0.000 -1.000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // 0.000 0.000 -2.000 -1.000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // 0.000 0.000 0.000 1.000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl_Position = vec4(2.0 * position.x - 1.0, 2.0 * position.y - 1.0, -1.0, 1.0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ frag_color = color;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libmovit/files/vs-color.150.vert b/multimedia/libmovit/files/vs-color.150.vert
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0bdd74d2218
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libmovit/files/vs-color.150.vert
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#version 150
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in vec2 position;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in vec4 color;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+out vec4 frag_color;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+void main()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // The result of glOrtho(0.0, 1.0, 0.0, 1.0, 0.0, 1.0) is:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // 2.000 0.000 0.000 -1.000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // 0.000 2.000 0.000 -1.000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // 0.000 0.000 -2.000 -1.000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // 0.000 0.000 0.000 1.000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl_Position = vec4(2.0 * position.x - 1.0, 2.0 * position.y - 1.0, -1.0, 1.0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ frag_color = color;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span></pre><pre style='margin:0'>
</pre>