diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2023-06-06 17:41:16 +0530 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2023-07-25 00:34:57 +0100 |
| commit | 20b131c6af2f9cda7c2dfe876e925e14c0eef0fb (patch) | |
| tree | de8979d1d1fb8d2792499e605323bac2e5b38869 | |
| parent | ff405f714727b68d2b8819312d5b210c795065d5 (diff) | |
packages: Put libass in the same category as assrender
The library is not GPL, it's BSD licensed. Fixes warnings at runtime
about gstassrender.dll not being loaded because libass-9.dll was not
found when restricted GPL plugins aren't selected in the MSI installer
for Windows.
Reported by Tobias Rapp on the mailing list.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1228>
| -rw-r--r-- | packages/gstreamer-1.0-codecs-gpl.package | 4 | ||||
| -rw-r--r-- | packages/gstreamer-1.0-codecs.package | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/packages/gstreamer-1.0-codecs-gpl.package b/packages/gstreamer-1.0-codecs-gpl.package index 3c4f0946..c2a39bf0 100644 --- a/packages/gstreamer-1.0-codecs-gpl.package +++ b/packages/gstreamer-1.0-codecs-gpl.package @@ -10,8 +10,7 @@ class Package(custom.GStreamer, package.Package): uuid = 'f685219b-7ee8-46b9-af3c-338e3cbb4f94' deps = ['gstreamer-1.0-core'] - files = ['libass:libs', - 'gst-plugins-base-1.0:plugins_codecs_gpl', + files = ['gst-plugins-base-1.0:plugins_codecs_gpl', 'gst-plugins-good-1.0:plugins_codecs_gpl', 'gst-plugins-bad-1.0:plugins_codecs_gpl', 'gst-plugins-ugly-1.0:plugins_codecs_gpl'] @@ -26,5 +25,4 @@ class Package(custom.GStreamer, package.Package): self.files.append('libiconv:libs') if self.config.variants.uwp: - self.files.remove('libass:libs') self.files.remove('libiconv:libs') diff --git a/packages/gstreamer-1.0-codecs.package b/packages/gstreamer-1.0-codecs.package index 0781454f..97dcb0b4 100644 --- a/packages/gstreamer-1.0-codecs.package +++ b/packages/gstreamer-1.0-codecs.package @@ -11,7 +11,7 @@ class Package(custom.GStreamer, package.Package): deps = ['gstreamer-1.0-core', 'base-crypto'] files = ['flac:libs', 'libkate:libs', 'libdv:libs', - 'libogg:libs', 'speex:libs', + 'libogg:libs', 'speex:libs', 'libass:libs', 'libtheora:libs', 'wavpack:libs', 'libvpx:libs', 'opus:libs', 'libvorbis:libs', 'openjpeg:libs', 'openh264:libs', 'tiff:libs', 'spandsp:libs', |