Skip to content

orc: integrate custom fluendo version #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aslobodeniuk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

orc: integrate custom fluendo version #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion build/base.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ recipes_remotes = {

recipes_commits = {
'gstreamer-1.0': gst_commit,
'gst-plugins-base-1.0': gst_commit,
# DO NOT MERGE
'gst-plugins-base-1.0': 'wasm-main-orc',
# -----------
'gst-plugins-good-1.0': gst_commit,
'gst-plugins-bad-1.0': gst_commit,
'gst-plugins-ugly-1.0': gst_commit,
Expand Down
22 changes: 9 additions & 13 deletions build/recipes/orc.recipe
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,20 @@ from cerbero.tools.libtool import LibtoolLibrary

class Recipe(recipe.Recipe):
name = 'orc'
version = '0.4.40'
version = '0.4.41'

stype = SourceType.TARBALL
# These properties are only used when stype is TARBALL
url = 'https://gstreamer.freedesktop.org/src/orc/orc-%(version)s.tar.xz'
tarball_checksum = '3fc2bee78dfb7c41fd9605061fc69138db7df007eae2f669a1f56e8bacef74ab'
# These properties are only used when stype is GIT
remotes = {'origin': 'https://gitlab.freedesktop.org/gstreamer/orc.git'}
commit = 'origin/main'

patches = [
'orc//0001-opcodes-Use-MIN-instead-of-CLAMP-for-known-unsigned-.patch',
]
stype = SourceType.GIT
remotes = {'fluendo': 'https://gitlab.freedesktop.org/fluendo/orc.git'}
# FIXME: change to gst.wasm
commit = 'fluendo/wasm-main-orc-support'

btype = BuildType.MESON
licenses = [{License.BSD_like: ['COPYING']}]
meson_options = {'benchmarks': 'disabled', 'tests': 'disabled',
'tools': 'enabled', 'orc-test': 'enabled'}
'tools': 'enabled', 'orc-test': 'disabled',
'orc-target': 'wasm', 'orc-backend': 'wasm',
'examples': 'disabled', 'gtk_doc': 'disabled',
}

files_libs = ['liborc-0.4']
files_devel = ['include/orc-0.4', '%(libdir)s/pkgconfig/orc-0.4.pc',
Expand Down
40 changes: 0 additions & 40 deletions build/recipes/orc/0001-opcodes-Use-MIN-instead-of-CLAMP-for-known-unsigned-.patch
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions guw/gstreamer.gst.wasm.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,8 @@ name = "libav-add-element-groups"
summary = "Add element_groups meson option to gst-libav"
status = "pending"
pr = "https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8877"

[[features]]
name = "wasm-main-orc"
remote = "origin"
status = "pending"
26 changes: 26 additions & 0 deletions guw/orc.gst.wasm.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
[[remotes]]
name = "fluendo"
url = "git@github.com:fluendo/orc.git"

[[remotes]]
name = "origin"
url = "git@ssh.gitlab.freedesktop.org:fluendo/orc.git"

[target]
remote = "fluendo"
branch = "gst.wasm"

[source]
remote = "fluendo"
branch = "main"

[upstream]
remote = "origin"
branch = "main"

[[features]]
remote = "fluendo"
name = "wasm-main-orc-support"
summary = "ORC: add wasm support"
pr = "https://gitlab.freedesktop.org/gstreamer/orc/-/merge_requests/234/diffs"
status = "pending"
Loading