diff options
author | Jose Quaresma <quaresma.jose@gmail.com> | 2020-11-28 22:13:15 +0000 |
---|---|---|
committer | Andrei Gherzan <andrei@gherzan.com> | 2021-02-26 12:49:18 +0000 |
commit | 0a89fb8dac35d12fa94a6598e04847e06645fe76 (patch) | |
tree | d882445ed108b079b372fa1c51a5cfabe15aa298 | |
parent | 946fc1ee5f8d8350a5ec2831070f3cc4ccc2621a (diff) | |
download | meta-raspberrypi-0a89fb8dac35d12fa94a6598e04847e06645fe76.tar.gz |
gstreamer1.0-omx: drop config-files-path.patch
gstreamer1.0-omx receipe on OE-core sets:
core-name=${GSTREAMER_1_0_OMX_CORE_NAME} on the installed gstomx.conf
in this case it will set:
core-name="${libdir}/libopenmaxil.so" in ${sysconfdir}/xdg/gstomx.conf
this is done in set_omx_core_name that is a do_install[postfuncs]
Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
-rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-omx/0001-config-files-path.patch | 150 | ||||
-rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend | 1 |
2 files changed, 0 insertions, 151 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-omx/0001-config-files-path.patch b/recipes-multimedia/gstreamer/gstreamer1.0-omx/0001-config-files-path.patch deleted file mode 100644 index 6903c17..0000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-omx/0001-config-files-path.patch +++ /dev/null | |||
@@ -1,150 +0,0 @@ | |||
1 | From 0dc88ed881eb8420dad4cf0934a900d85b6ef313 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 11 Feb 2016 12:53:20 -0800 | ||
4 | |||
5 | --- | ||
6 | config/bellagio/gstomx.conf | 8 ++++---- | ||
7 | config/rpi/gstomx.conf | 22 +++++++++++----------- | ||
8 | 2 files changed, 15 insertions(+), 15 deletions(-) | ||
9 | |||
10 | diff --git a/config/bellagio/gstomx.conf b/config/bellagio/gstomx.conf | ||
11 | index 5ca8ba6..8931255 100644 | ||
12 | --- a/config/bellagio/gstomx.conf | ||
13 | +++ b/config/bellagio/gstomx.conf | ||
14 | @@ -1,6 +1,6 @@ | ||
15 | [omxmpeg4videodec] | ||
16 | type-name=GstOMXMPEG4VideoDec | ||
17 | -core-name=/usr/local/lib/libomxil-bellagio.so.0 | ||
18 | +core-name=/usr/lib/libomxil-bellagio.so.0 | ||
19 | component-name=OMX.st.video_decoder.mpeg4 | ||
20 | rank=257 | ||
21 | in-port-index=0 | ||
22 | @@ -9,7 +9,7 @@ hacks=event-port-settings-changed-ndata-parameter-swap;event-port-settings-chang | ||
23 | |||
24 | [omxh264dec] | ||
25 | type-name=GstOMXH264Dec | ||
26 | -core-name=/usr/local/lib/libomxil-bellagio.so.0 | ||
27 | +core-name=/usr/lib/libomxil-bellagio.so.0 | ||
28 | component-name=OMX.st.video_decoder.avc | ||
29 | rank=257 | ||
30 | in-port-index=0 | ||
31 | @@ -18,7 +18,7 @@ hacks=event-port-settings-changed-ndata-parameter-swap;event-port-settings-chang | ||
32 | |||
33 | [omxmpeg4videoenc] | ||
34 | type-name=GstOMXMPEG4VideoEnc | ||
35 | -core-name=/usr/local/lib/libomxil-bellagio.so.0 | ||
36 | +core-name=/usr/lib/libomxil-bellagio.so.0 | ||
37 | component-name=OMX.st.video_encoder.mpeg4 | ||
38 | rank=0 | ||
39 | in-port-index=0 | ||
40 | @@ -27,7 +27,7 @@ hacks=event-port-settings-changed-ndata-parameter-swap;video-framerate-integer;s | ||
41 | |||
42 | [omxaacenc] | ||
43 | type-name=GstOMXAACEnc | ||
44 | -core-name=/usr/local/lib/libomxil-bellagio.so.0 | ||
45 | +core-name=/usr/lib/libomxil-bellagio.so.0 | ||
46 | component-name=OMX.st.audio_encoder.aac | ||
47 | rank=0 | ||
48 | in-port-index=0 | ||
49 | diff --git a/config/rpi/gstomx.conf b/config/rpi/gstomx.conf | ||
50 | index d3ea56a..2508dae 100644 | ||
51 | --- a/config/rpi/gstomx.conf | ||
52 | +++ b/config/rpi/gstomx.conf | ||
53 | @@ -1,6 +1,6 @@ | ||
54 | [omxmpeg2videodec] | ||
55 | type-name=GstOMXMPEG2VideoDec | ||
56 | -core-name=/opt/vc/lib/libopenmaxil.so | ||
57 | +core-name=/usr/lib/libopenmaxil.so | ||
58 | component-name=OMX.broadcom.video_decode | ||
59 | rank=257 | ||
60 | in-port-index=130 | ||
61 | @@ -9,7 +9,7 @@ hacks=no-component-role | ||
62 | |||
63 | [omxmpeg4videodec] | ||
64 | type-name=GstOMXMPEG4VideoDec | ||
65 | -core-name=/opt/vc/lib/libopenmaxil.so | ||
66 | +core-name=/usr/lib/libopenmaxil.so | ||
67 | component-name=OMX.broadcom.video_decode | ||
68 | rank=257 | ||
69 | in-port-index=130 | ||
70 | @@ -18,7 +18,7 @@ hacks=no-component-role | ||
71 | |||
72 | [omxh263dec] | ||
73 | type-name=GstOMXH263Dec | ||
74 | -core-name=/opt/vc/lib/libopenmaxil.so | ||
75 | +core-name=/usr/lib/libopenmaxil.so | ||
76 | component-name=OMX.broadcom.video_decode | ||
77 | rank=257 | ||
78 | in-port-index=130 | ||
79 | @@ -27,7 +27,7 @@ hacks=no-component-role | ||
80 | |||
81 | [omxh264dec] | ||
82 | type-name=GstOMXH264Dec | ||
83 | -core-name=/opt/vc/lib/libopenmaxil.so | ||
84 | +core-name=/usr/lib/libopenmaxil.so | ||
85 | component-name=OMX.broadcom.video_decode | ||
86 | rank=257 | ||
87 | in-port-index=130 | ||
88 | @@ -36,7 +36,7 @@ hacks=no-component-role;signals-premature-eos | ||
89 | |||
90 | [omxtheoradec] | ||
91 | type-name=GstOMXTheoraDec | ||
92 | -core-name=/opt/vc/lib/libopenmaxil.so | ||
93 | +core-name=/usr/lib/libopenmaxil.so | ||
94 | component-name=OMX.broadcom.video_decode | ||
95 | rank=257 | ||
96 | in-port-index=130 | ||
97 | @@ -45,7 +45,7 @@ hacks=no-component-role | ||
98 | |||
99 | [omxvp8dec] | ||
100 | type-name=GstOMXVP8Dec | ||
101 | -core-name=/opt/vc/lib/libopenmaxil.so | ||
102 | +core-name=/usr/lib/libopenmaxil.so | ||
103 | component-name=OMX.broadcom.video_decode | ||
104 | rank=257 | ||
105 | in-port-index=130 | ||
106 | @@ -54,7 +54,7 @@ hacks=no-component-role | ||
107 | |||
108 | [omxmjpegdec] | ||
109 | type-name=GstOMXMJPEGDec | ||
110 | -core-name=/opt/vc/lib/libopenmaxil.so | ||
111 | +core-name=/usr/lib/libopenmaxil.so | ||
112 | component-name=OMX.broadcom.video_decode | ||
113 | rank=257 | ||
114 | in-port-index=130 | ||
115 | @@ -63,7 +63,7 @@ hacks=no-component-role | ||
116 | |||
117 | [omxvc1dec] | ||
118 | type-name=GstOMXWMVDec | ||
119 | -core-name=/opt/vc/lib/libopenmaxil.so | ||
120 | +core-name=/usr/lib/libopenmaxil.so | ||
121 | component-name=OMX.broadcom.video_decode | ||
122 | rank=257 | ||
123 | in-port-index=130 | ||
124 | @@ -73,7 +73,7 @@ sink-template-caps=video/x-wmv,wmvversion=(int)3,format=(string){WMV3,WVC1},widt | ||
125 | |||
126 | [omxh264enc] | ||
127 | type-name=GstOMXH264Enc | ||
128 | -core-name=/opt/vc/lib/libopenmaxil.so | ||
129 | +core-name=/usr/lib/libopenmaxil.so | ||
130 | component-name=OMX.broadcom.video_encode | ||
131 | rank=257 | ||
132 | in-port-index=200 | ||
133 | @@ -82,7 +82,7 @@ hacks=no-component-role;no-component-reconfigure | ||
134 | |||
135 | [omxanalogaudiosink] | ||
136 | type-name=GstOMXAnalogAudioSink | ||
137 | -core-name=/opt/vc/lib/libopenmaxil.so | ||
138 | +core-name=/usr/lib/libopenmaxil.so | ||
139 | component-name=OMX.broadcom.audio_render | ||
140 | rank=257 | ||
141 | in-port-index=100 | ||
142 | @@ -92,7 +92,7 @@ sink-template-caps=audio/x-raw,format=(string){S16LE,S32LE},layout=(string)inter | ||
143 | |||
144 | [omxhdmiaudiosink] | ||
145 | type-name=GstOMXHdmiAudioSink | ||
146 | -core-name=/opt/vc/lib/libopenmaxil.so | ||
147 | +core-name=/usr/lib/libopenmaxil.so | ||
148 | component-name=OMX.broadcom.audio_render | ||
149 | rank=258 | ||
150 | in-port-index=100 | ||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend index 8cd97ca..a971236 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend +++ b/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend | |||
@@ -1,7 +1,6 @@ | |||
1 | FILESEXTRAPATHS_prepend_rpi := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend_rpi := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | SRC_URI_append_rpi = " \ | 3 | SRC_URI_append_rpi = " \ |
4 | file://0001-config-files-path.patch \ | ||
5 | file://0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch \ | 4 | file://0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch \ |
6 | file://0003-no-timeout-on-get-state.patch \ | 5 | file://0003-no-timeout-on-get-state.patch \ |
7 | file://0004-Properly-handle-drain-requests-while-flushing.patch \ | 6 | file://0004-Properly-handle-drain-requests-while-flushing.patch \ |