1berry/HandBrake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LinGUI: Updates to meson.build

Browse Source 
- Fixes for building with Nix
- Remove unneeded resources list
This commit is contained in:
robxnano 2024-03-20 19:27:50 +00:00 committed by Damiano Galassi
parent 42fc7e2b1f
commit 4d52ef55a8
6 changed files with 18 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gtk/icons/meson.build
View File

@ -1,45 +1,7 @@
# Copyright (C) 2023-2024 HandBrake Team
# SPDX-License-Identifier: GPL-2.0-or-later
icon_files = files(
'24x24/apps/hb-advanced-symbolic.symbolic.png',
'32x32/apps/hb-source-symbolic.symbolic.png',
'32x32/apps/hb-picture-symbolic.symbolic.png',
'32x32/apps/hb-add-queue-symbolic.symbolic.png',
'32x32/apps/hb-showqueue-symbolic.symbolic.png',
'32x32/apps/hb-activity-symbolic.symbolic.png',
'32x32/apps/hb-presets-symbolic.symbolic.png',
'32x32/apps/hb-start.png',
'32x32/apps/hb-stop.png',
'32x32/apps/hb-pause.png',
'48x48/apps/hb-advanced-symbolic.symbolic.png',
'64x64/apps/hb-source-symbolic.symbolic.png',
'64x64/apps/hb-picture-symbolic.symbolic.png',
'64x64/apps/hb-add-queue-symbolic.symbolic.png',
'64x64/apps/hb-showqueue-symbolic.symbolic.png',
'64x64/apps/hb-activity-symbolic.symbolic.png',
'64x64/apps/hb-presets-symbolic.symbolic.png',
'64x64/apps/hb-start.png',
'64x64/apps/hb-stop.png',
'64x64/apps/hb-pause.png',
'128x128/apps/fr.handbrake.ghb.png',
'256x256/apps/fr.handbrake.ghb.png',
'scalable/apps/fr.handbrake.ghb.svg',
'scalable/apps/hb-advanced-symbolic.svg',
'scalable/apps/hb-source-symbolic.svg',
'scalable/apps/hb-picture-symbolic.svg',
'scalable/apps/hb-add-queue-symbolic.svg',
'scalable/apps/hb-showqueue-symbolic.svg',
'scalable/apps/hb-activity-symbolic.svg',
'scalable/apps/hb-presets-symbolic.svg',
'scalable/apps/hb-start.svg',
'scalable/apps/hb-stop.svg',
'scalable/apps/hb-pause.svg',
'scalable/apps/hb-complete.svg',
)
icons = gnome.compile_resources('icon_res', 'icon_res.gresource.xml',
dependencies: icon_files,
c_name: 'ghb_icons')
if host_machine.system() not in ['windows', 'haiku']

23
gtk/meson.build
View File

@ -20,15 +20,21 @@ if hb_dir == ''
hb_dir = meson.current_build_dir() / '..'
endif
hb_libdirs = [hb_dir / 'libhb', hb_dir / 'contrib/lib'] + get_option('extra-libdirs')
hb_libdirs = [hb_dir / 'libhb', hb_dir / 'contrib/lib']
hb_incdirs = include_directories(hb_dir / 'libhb', hb_dir / 'contrib/include')
if host_machine.system() == 'windows'
win_libdirs = { 'dirs': hb_libdirs }
else
win_libdirs = {}
endif
# External dependencies (required)
ghb_deps = [
cc.find_library('handbrake', dirs: hb_libdirs),
cc.find_library('bz2', dirs: hb_libdirs),
cc.find_library('m', required: false),
cc.find_library('mp3lame', dirs: hb_libdirs),
cc.find_library('bz2', kwargs: win_libdirs),
cc.find_library('m'),
cc.find_library('mp3lame', kwargs: win_libdirs),
dependency('dvdnav'),
dependency('dvdread'),
dependency('dav1d'),
@ -75,10 +81,9 @@ if get_option('fdk-aac').enabled()
endif
if get_option('qsv').enabled()
if host_machine.system() == 'windows'
ghb_deps += cc.find_library('vpl', dirs: hb_libdirs)
else
ghb_deps += [dependency('vpl'), dependency('libva'), dependency('libva-drm')]
ghb_deps += dependency('vpl')
if host_machine.system() != 'windows'
ghb_deps += [dependency('libva'), dependency('libva-drm')]
endif
endif
@ -110,7 +115,7 @@ elif not cc.has_function('dlopen')
endif
if not cc.has_function('iconv')
ghb_deps += cc.find_library('iconv', dirs: get_option('extra-libdirs'))
ghb_deps += cc.find_library('iconv')
add_project_arguments('-DLIBICONV_PLUG', language: ['c', 'cpp'])
endif

10
gtk/meson_options.txt
View File

@ -1,8 +1,3 @@
option('extra-libdirs',
type: 'array',
value: [],
description: 'Extra directories to search for libraries')
option('fdk-aac',
type: 'feature',
value: 'disabled',
@ -13,11 +8,6 @@ option('flatpak',
value: false,
description: 'Enable Flatpak packaging')
option('gstreamer',
type: 'feature',
value: 'disabled',
description: 'DEPRECATED: gstreamer is no longer used')
option('hb-dir',
type: 'string',
value: '',

4
gtk/module.defs
View File

@ -8,7 +8,7 @@ GTK.CONFIGURE.stamp = $(GTK.build/)build.ninja
GTK.CONFIGURE.exe = $(MESON.exe)
GTK.CONFIGURE.extra = -Dc_args="$(call fn.ARGS,GTK.GCC,*D ?extra)" \
-Dc_link_args="$(call fn.ARGS,GTK.GCC,?extra.exe)" \
-Dc_link_args="$(call fn.ARGS,GTK.GCC,?extra.exe) $(GTK.CONFIGURE.libdirs)" \
--pkg-config-path=$(call fn.ABSOLUTE,$(BUILD/))contrib/lib/pkgconfig:$(PKG_CONFIG_PATH) \
--prefix=$(PREFIX) -Dhb-dir=$(call fn.ABSOLUTE,$(BUILD/))
GTK.CONFIGURE.env =
@ -84,7 +84,7 @@ else
endif
ifneq (,$(filter $(HOST.system),freebsd netbsd openbsd))
GTK.CONFIGURE.extra += -Dextra-libdirs=$(LOCALBASE)/lib
GTK.CONFIGURE.libdirs = -L$(LOCALBASE)/lib
endif
ifeq (mingw,$(HOST.system))

2
make/cross/aarch64-w64-mingw32.meson
View File

@ -3,7 +3,7 @@ c = 'aarch64-w64-mingw32-gcc'
cpp = 'aarch64-w64-mingw32-g++'
rust = ['rustc', '--target', 'aarch64-pc-windows-msvc', '-C', 'linker=aarch64-w64-mingw32-gcc']
ar = 'aarch64-w64-mingw32-ar'
pkgconfig = 'aarch64-w64-mingw32-pkg-config'
pkg-config = 'aarch64-w64-mingw32-pkg-config'
ranlib = 'aarch64-w64-mingw32-ranlib'
strip = 'aarch64-w64-mingw32-strip'
windres = 'aarch64-w64-mingw32-windres'

2
make/cross/x86_64-w64-mingw32.meson
View File

@ -3,7 +3,7 @@ c = 'x86_64-w64-mingw32-gcc'
cpp = 'x86_64-w64-mingw32-g++'
rust = ['rustc', '--target', 'x86_64-pc-windows-msvc', '-C', 'linker=x86_64-w64-mingw32-gcc']
ar = 'x86_64-w64-mingw32-ar'
pkgconfig = 'x86_64-w64-mingw32-pkg-config'
pkg-config = 'x86_64-w64-mingw32-pkg-config'
ranlib = 'x86_64-w64-mingw32-ranlib'
strip = 'x86_64-w64-mingw32-strip'
windres = 'x86_64-w64-mingw32-windres'