Skip to content

Commit

Permalink
movit: update to 1.7.1 (getsolus#2698)
Browse files Browse the repository at this point in the history
**Summary**
- Fix an off-by-one in shader bundle generation.

- Non-ASCII characters would inadvertently become two bytes instead of
one, which would (for shaders after that in the bundle) give the wrong
offsets and thus potentially corrupted shaders. Normally, this wouldn't
really be noticed since the first things are comments and the lasts are
#undef, but in some cases, the shader compilers would complain on
suspicious things.

**Test Plan**
- Rebuilt dependencies.

**Checklist**

- [X] Package was built and tested against unstable
  • Loading branch information
malfisya committed May 25, 2024
2 parents 9594b2c + 0f5809a commit 4183575
Show file tree
Hide file tree
Showing 10 changed files with 42 additions and 216 deletions.
19 changes: 10 additions & 9 deletions packages/m/mlt/abi_used_symbols
Original file line number Diff line number Diff line change
Expand Up @@ -1517,8 +1517,8 @@ libQt5Xml.so.5:_ZNK8QDomNode9isElementEv
libQt5Xml.so.5:_ZNK8QDomNode9namedItemERK7QString
libQt5Xml.so.5:_ZNK8QDomNode9nodeValueEv
libQt5Xml.so.5:_ZNK8QDomNode9toElementEv
libQt6Core.so.6:_Z20qt_qFindChild_helperPK7QObjectRK7QStringRK11QMetaObject6QFlagsIN2Qt15FindChildOptionEE
libQt6Core.so.6:_Z23qt_qFindChildren_helperPK7QObjectRK11QMetaObjectP5QListIPvE6QFlagsIN2Qt15FindChildOptionEE
libQt6Core.so.6:_Z20qt_qFindChild_helperPK7QObject14QAnyStringViewRK11QMetaObject6QFlagsIN2Qt15FindChildOptionEE
libQt6Core.so.6:_Z23qt_qFindChildren_helperPK7QObject14QAnyStringViewRK11QMetaObjectP5QListIPvE6QFlagsIN2Qt15FindChildOptionEE
libQt6Core.so.6:_Z26qt_QMetaEnum_debugOperatorR6QDebugxPK11QMetaObjectPKc
libQt6Core.so.6:_Z53qRegisterNormalizedMetaType_QPairVariantInterfaceImplRK10QByteArray
libQt6Core.so.6:_Z5qHash11QStringViewm
Expand Down Expand Up @@ -1581,10 +1581,12 @@ libQt6Core.so.6:_ZN11QDataStreamlsEb
libQt6Core.so.6:_ZN11QDataStreamlsEd
libQt6Core.so.6:_ZN11QDataStreamlsEi
libQt6Core.so.6:_ZN11QDataStreamlsEs
libQt6Core.so.6:_ZN11QDataStreamlsEx
libQt6Core.so.6:_ZN11QDataStreamrsERb
libQt6Core.so.6:_ZN11QDataStreamrsERd
libQt6Core.so.6:_ZN11QDataStreamrsERi
libQt6Core.so.6:_ZN11QDataStreamrsERs
libQt6Core.so.6:_ZN11QDataStreamrsERx
libQt6Core.so.6:_ZN11QFileDevice5closeEv
libQt6Core.so.6:_ZN11QFileDevice5flushEv
libQt6Core.so.6:_ZN11QJsonObject14fromVariantMapERK4QMapI7QString8QVariantE
Expand Down Expand Up @@ -1767,7 +1769,7 @@ libQt6Core.so.6:_ZN7QObject11eventFilterEPS_P6QEvent
libQt6Core.so.6:_ZN7QObject11qt_metacallEN11QMetaObject4CallEiPPv
libQt6Core.so.6:_ZN7QObject11qt_metacastEPKc
libQt6Core.so.6:_ZN7QObject12blockSignalsEb
libQt6Core.so.6:_ZN7QObject12moveToThreadEP7QThread
libQt6Core.so.6:_ZN7QObject12moveToThreadEP7QThreadN2Qt15Disambiguated_tE
libQt6Core.so.6:_ZN7QObject13connectNotifyERK11QMetaMethod
libQt6Core.so.6:_ZN7QObject13setObjectNameE14QAnyStringView
libQt6Core.so.6:_ZN7QObject14disconnectImplEPKS_PPvS1_S3_PK11QMetaObject
Expand Down Expand Up @@ -1796,6 +1798,7 @@ libQt6Core.so.6:_ZN7QString6appendE20QBasicUtf8StringViewILb0EE
libQt6Core.so.6:_ZN7QString6appendE5QChar
libQt6Core.so.6:_ZN7QString6appendEPK5QCharx
libQt6Core.so.6:_ZN7QString6appendERKS_
libQt6Core.so.6:_ZN7QString6assignE14QAnyStringView
libQt6Core.so.6:_ZN7QString6numberEdci
libQt6Core.so.6:_ZN7QString6numberEii
libQt6Core.so.6:_ZN7QString6numberExi
Expand Down Expand Up @@ -1929,8 +1932,6 @@ libQt6Core.so.6:_ZN9QtPrivate28QStringList_removeDuplicatesEP5QListI7QStringE
libQt6Core.so.6:_ZN9QtPrivate7trimmedE11QStringView
libQt6Core.so.6:_ZN9QtPrivate8endsWithE14QByteArrayViewS0_
libQt6Core.so.6:_ZNK10QByteArray11toStdStringB5cxx11Ev
libQt6Core.so.6:_ZNK10QByteArray3midExx
libQt6Core.so.6:_ZNK10QByteArray4leftEx
libQt6Core.so.6:_ZNK10QByteArray5toIntEPbi
libQt6Core.so.6:_ZNK10QByteArray7indexOfEcx
libQt6Core.so.6:_ZNK10QByteArray8toBase64E6QFlagsINS_12Base64OptionEE
Expand Down Expand Up @@ -2069,7 +2070,7 @@ libQt6Core.so.6:_ZNK6QRectF8containsERK7QPointF
libQt6Core.so.6:_ZNK6QRectForERKS_
libQt6Core.so.6:_ZNK7QLocale17nativeCountryNameEv
libQt6Core.so.6:_ZNK7QLocale18nativeLanguageNameEv
libQt6Core.so.6:_ZNK7QLocale4nameEv
libQt6Core.so.6:_ZNK7QLocale4nameENS_12TagSeparatorE
libQt6Core.so.6:_ZNK7QLocale6scriptEv
libQt6Core.so.6:_ZNK7QLocale7countryEv
libQt6Core.so.6:_ZNK7QObject10metaObjectEv
Expand All @@ -2087,9 +2088,6 @@ libQt6Core.so.6:_ZNK7QString3argEci5QChar
libQt6Core.so.6:_ZNK7QString3argEdici5QChar
libQt6Core.so.6:_ZNK7QString3argExii5QChar
libQt6Core.so.6:_ZNK7QString3argEyii5QChar
libQt6Core.so.6:_ZNK7QString3midExx
libQt6Core.so.6:_ZNK7QString4leftEx
libQt6Core.so.6:_ZNK7QString5rightEx
libQt6Core.so.6:_ZNK7QString5splitE5QChar6QFlagsIN2Qt18SplitBehaviorFlagsEENS2_15CaseSensitivityE
libQt6Core.so.6:_ZNK7QString5splitERK18QRegularExpression6QFlagsIN2Qt18SplitBehaviorFlagsEE
libQt6Core.so.6:_ZNK7QString5splitERKS_6QFlagsIN2Qt18SplitBehaviorFlagsEENS3_15CaseSensitivityE
Expand Down Expand Up @@ -2147,6 +2145,9 @@ libQt6Core.so.6:_ZNK9QSettings11childGroupsEv
libQt6Core.so.6:_ZNK9QSettings5valueE14QAnyStringView
libQt6Core.so.6:_ZNK9QSettings5valueE14QAnyStringViewRK8QVariant
libQt6Core.so.6:_ZNK9QSettings9childKeysEv
libQt6Core.so.6:_ZNKR10QByteArray3midExx
libQt6Core.so.6:_ZNKR7QString3midExx
libQt6Core.so.6:_ZNO7QString3midExx
libQt6Core.so.6:_ZTI18QAbstractItemModel
libQt6Core.so.6:_ZTI19QAbstractTableModel
libQt6Core.so.6:_ZTI21QSortFilterProxyModel
Expand Down
2 changes: 1 addition & 1 deletion packages/m/mlt/package.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name : mlt
version : 7.22.0
release : 42
release : 43
source :
- https://github.com/mltframework/mlt/releases/download/v7.22.0/mlt-7.22.0.tar.gz : 7cf4d9573a061d76902c6e12a2f09f5f461e7c697635233df82a63a3fe4d6da6
homepage : https://www.mltframework.org/
Expand Down
16 changes: 8 additions & 8 deletions packages/m/mlt/pspec_x86_64.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<Name>mlt</Name>
<Homepage>https://www.mltframework.org/</Homepage>
<Packager>
<Name>Reilly Brogan</Name>
<Email>solus@reillybrogan.com</Email>
<Name>Jakob Gezelius</Name>
<Email>jakob@knugen.nu</Email>
</Packager>
<License>GPL-2.0-or-later</License>
<License>GPL-3.0-or-later</License>
Expand Down Expand Up @@ -431,7 +431,7 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
<Dependency release="42">mlt</Dependency>
<Dependency release="43">mlt</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/mlt-7/framework/mlt.h</Path>
Expand Down Expand Up @@ -510,20 +510,20 @@
<Description xml:lang="en">Multimedia framework designed for television broadcasting.
</Description>
<RuntimeDependencies>
<Dependency release="42">mlt</Dependency>
<Dependency release="43">mlt</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/python3.11/site-packages/_mlt7.so</Path>
<Path fileType="library">/usr/lib/python3.11/site-packages/mlt7.py</Path>
</Files>
</Package>
<History>
<Update release="42">
<Date>2024-03-11</Date>
<Update release="43">
<Date>2024-05-25</Date>
<Version>7.22.0</Version>
<Comment>Packaging update</Comment>
<Name>Reilly Brogan</Name>
<Email>solus@reillybrogan.com</Email>
<Name>Jakob Gezelius</Name>
<Email>jakob@knugen.nu</Email>
</Update>
</History>
</PISI>
3 changes: 3 additions & 0 deletions packages/m/movit/abi_symbols
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ libmovit.so.8:_ZN5movit13SandboxEffect12set_gl_stateEjRKNSt7__cxx1112basic_strin
libmovit.so.8:_ZN5movit13SandboxEffect22output_fragment_shaderB5cxx11Ev
libmovit.so.8:_ZN5movit13SandboxEffectC1Ev
libmovit.so.8:_ZN5movit13SandboxEffectC2Ev
libmovit.so.8:_ZN5movit13shader_bundleE
libmovit.so.8:_ZN5movit14MultiplyEffect22output_fragment_shaderB5cxx11Ev
libmovit.so.8:_ZN5movit14MultiplyEffectC1Ev
libmovit.so.8:_ZN5movit14MultiplyEffectC2Ev
Expand Down Expand Up @@ -173,6 +174,7 @@ libmovit.so.8:_ZN5movit15DiffusionEffectC2Ev
libmovit.so.8:_ZN5movit15DiffusionEffectD0Ev
libmovit.so.8:_ZN5movit15DiffusionEffectD1Ev
libmovit.so.8:_ZN5movit15DiffusionEffectD2Ev
libmovit.so.8:_ZN5movit15bundled_shadersE
libmovit.so.8:_ZN5movit15set_uniform_intEjRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES7_i
libmovit.so.8:_ZN5movit16SaturationEffect22output_fragment_shaderB5cxx11Ev
libmovit.so.8:_ZN5movit16SaturationEffectC1Ev
Expand Down Expand Up @@ -259,6 +261,7 @@ libmovit.so.8:_ZN5movit21YCbCrConversionEffectC1ERKNS_11YCbCrFormatEj
libmovit.so.8:_ZN5movit21YCbCrConversionEffectC2ERKNS_11YCbCrFormatEj
libmovit.so.8:_ZN5movit21compute_chroma_offsetEfjj
libmovit.so.8:_ZN5movit21fill_vertex_attributeEjRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEijlPKv
libmovit.so.8:_ZN5movit21read_file_from_bundleERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
libmovit.so.8:_ZN5movit22GammaCompressionEffect12set_gl_stateEjRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPj
libmovit.so.8:_ZN5movit22GammaCompressionEffect22output_fragment_shaderB5cxx11Ev
libmovit.so.8:_ZN5movit22GammaCompressionEffectC1Ev
Expand Down
7 changes: 5 additions & 2 deletions packages/m/movit/abi_used_symbols
Original file line number Diff line number Diff line change
Expand Up @@ -124,20 +124,23 @@ libm.so.6:sincos
libm.so.6:sinf
libm.so.6:sqrtf
libstdc++.so.6:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4findEPKcmm
libstdc++.so.6:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE7compareEPKc
libstdc++.so.6:_ZNSdD2Ev
libstdc++.so.6:_ZNSi10_M_extractIdEERSiRT_
libstdc++.so.6:_ZNSo9_M_insertIdEERSoT_
libstdc++.so.6:_ZNSt6localeC1EPKc
libstdc++.so.6:_ZNSt6localeC1Ev
libstdc++.so.6:_ZNSt6localeD1Ev
libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_disposeEv
libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm
libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6appendEPKc
libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6appendEPKcm
libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6resizeEmc
libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE7reserveEm
libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_appendEPKcm
libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_assignERKS4_
libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_createERmm
libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_mutateEmmPKcm
libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC1EOS4_
libstdc++.so.6:_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEE7_M_syncEPcmm
libstdc++.so.6:_ZNSt7__cxx1118basic_stringstreamIcSt11char_traitsIcESaIcEED1Ev
libstdc++.so.6:_ZNSt7__cxx1119basic_istringstreamIcSt11char_traitsIcESaIcEED1Ev
Expand Down Expand Up @@ -174,7 +177,7 @@ libstdc++.so.6:_ZTVSt15basic_streambufIcSt11char_traitsIcEE
libstdc++.so.6:_ZTVSt9bad_alloc
libstdc++.so.6:_ZTVSt9basic_iosIcSt11char_traitsIcEE
libstdc++.so.6:_ZdaPv
libstdc++.so.6:_ZdlPv
libstdc++.so.6:_ZdlPvm
libstdc++.so.6:_Znam
libstdc++.so.6:_Znwm
libstdc++.so.6:__cxa_allocate_exception
Expand Down
24 changes: 0 additions & 24 deletions packages/m/movit/files/0001-Fix-build-with-GCC-12.patch

This file was deleted.

111 changes: 0 additions & 111 deletions packages/m/movit/files/Use-exact-sRGB-matrix-values.patch

This file was deleted.

2 changes: 0 additions & 2 deletions packages/m/movit/files/series

This file was deleted.

8 changes: 4 additions & 4 deletions packages/m/movit/package.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
name : movit
version : 1.6.3
release : 7
version : 1.7.1
release : 8
source :
- https://movit.sesse.net/movit-1.6.3.tar.gz : eb19f109ec99d6050de5267d059c7b351d3d5e39c77d43ca348a95f474a99498
- https://movit.sesse.net/movit-1.7.1.tar.gz : b33073b705f0ccb6ac4942cf51151515407b40bb4e9a2dd0228c1c2cb1fbc11a
- https://github.com/google/googletest/archive/release-1.12.1.tar.gz : 81964fe578e9bd7c94dfdb09c8e4d6e6759e19967e397dbea48d1c10e45d0df2
homepage : https://movit.sesse.net/
license : GPL-2.0-or-later
component : multimedia.graphics
summary : High-performance, high-quality video filters for the GPU
Expand All @@ -18,7 +19,6 @@ builddeps :
- pkgconfig(gtest)
- pkgconfig(x11)
setup : |
%apply_patches
# Extract gtest sources which are unfortunately required...
tar xf $sources/release-* -C .
%configure
Expand Down
Loading

0 comments on commit 4183575

Please sign in to comment.