OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson/vdpau: add missing soversion

Browse Source 
This mirrors what autotools does in src/gallium/state_trackers/vdpau/Makefile.am
and src/gallium/targets/vdpau/Makefile.am:

  VDPAU_MAJOR = 1
  VDPAU_MINOR = 0
  libvdpau_gallium_la_LDFLAGS = -version-number $(VDPAU_MAJOR):$(VDPAU_MINOR)

Reported-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Fixes: 68076b8747 "meson: build gallium vdpau state tracker"
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
This commit is contained in:
Eric Engestrom
2018-12-11 16:51:25 +00:00
parent 9af77fcf98
commit 69e9440367
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gallium/state_trackers/vdpau/meson.build
View File

@@ -18,13 +18,20 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE. # SOFTWARE.
VDPAU_MAJOR = 1
VDPAU_MINOR = 0
libvdpau_st = static_library( libvdpau_st = static_library(
'vdpau_st', 'vdpau_st',
files( files(
'bitmap.c', 'decode.c', 'device.c', 'ftab.c', 'htab.c', 'mixer.c', 'bitmap.c', 'decode.c', 'device.c', 'ftab.c', 'htab.c', 'mixer.c',
'output.c', 'preemption.c', 'presentation.c', 'query.c', 'surface.c', 'output.c', 'preemption.c', 'presentation.c', 'query.c', 'surface.c',
), ),
c_args : [c_vis_args, '-DVER_MAJOR=1', '-DVER_MINOR=0'], c_args : [
c_vis_args,
'-DVER_MAJOR=@0@'.format(VDPAU_MAJOR),
'-DVER_MINOR=@0@'.format(VDPAU_MINOR),
],
include_directories : [ include_directories : [
inc_include, inc_src, inc_util, inc_gallium, inc_gallium_aux, inc_include, inc_src, inc_util, inc_gallium, inc_gallium_aux,
], ],

3
src/gallium/targets/vdpau/meson.build
View File

@@ -54,13 +54,14 @@ libvdpau_gallium = shared_library(
dep_thread, driver_r300, driver_r600, driver_radeonsi, driver_nouveau, dep_thread, driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
], ],
link_depends : vdpau_link_depends, link_depends : vdpau_link_depends,
soversion : '@0@.@1@.0'.format(VDPAU_MAJOR, VDPAU_MINOR),
) )
foreach d : [[with_gallium_r300, 'r300'], foreach d : [[with_gallium_r300, 'r300'],
[with_gallium_r600, 'r600'], [with_gallium_r600, 'r600'],
[with_gallium_radeonsi, 'radeonsi'], [with_gallium_radeonsi, 'radeonsi'],
[with_gallium_nouveau, 'nouveau']] [with_gallium_nouveau, 'nouveau']]
if d[0] if d[0]
vdpau_drivers += 'libvdpau_@0@.so.1.0.0'.format(d[1]) vdpau_drivers += 'libvdpau_@0@.so.@1@.@2@.0'.format(d[1], VDPAU_MAJOR, VDPAU_MINOR)
endif endif
endforeach endforeach