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

NetBSD: Build fixes

Browse Source 
- Update python versions
- Add libjpeg-turbo to modules to avoid conflict
- Fix failure to make metainfo file
This commit is contained in:
robxnano 2023-03-18 19:02:25 +00:00 committed by Damiano Galassi
parent e489823ecb
commit 1ba1f05230
5 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure vendored
View File

@ -1,5 +1,4 @@
#!/bin/sh #!/bin/sh
#
inpath() inpath()
{ {
@ -13,19 +12,13 @@ inpath()
return 1 return 1
} }
pp="" for p in python3 python3.11 python3.10 python3.9 python3.8 python3.7 python3.6 python
for p in python3 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python2 python2.7 python
do do
if ( inpath $p ); then if ( inpath $p ); then
pp="$p" exec $p `dirname $0`/make/configure.py "$@"
break exit 0
fi fi
done done
if [ "$pp" != "" ]; then
exec $pp `dirname $0`/make/configure.py "$@"
exit 0
else
echo "ERROR: no suitable version of python found."
fi
echo "ERROR: no suitable version of python found."
exit 1 exit 1

2
gtk/src/Makefile.am
View File

@ -179,7 +179,7 @@ widget.deps: makedeps.py
$(HB_PYTHON) $(srcdir)/makedeps.py $(HB_PYTHON) $(srcdir)/makedeps.py
fr.handbrake.ghb.metainfo.xml: fr.handbrake.ghb.metainfo.xml.in fr.handbrake.ghb.metainfo.xml: fr.handbrake.ghb.metainfo.xml.in
$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ || cp $< $@
fr.handbrake.ghb.metainfo.xml.in: fr.handbrake.ghb.metainfo.xml.in.in fr.handbrake.ghb.metainfo.xml.in: fr.handbrake.ghb.metainfo.xml.in.in
sed -e 's^RELEASE_TAG^<release version="$(HB.version)" date="$(word 1,$(HB.repo.date))" />^' $< > $@ sed -e 's^RELEASE_TAG^<release version="$(HB.version)" date="$(word 1,$(HB.repo.date))" />^' $< > $@

3
libhb/module.defs
View File

@ -6,6 +6,9 @@ __deps__ := A52DEC BZIP2 LIBVPX SVT-AV1 FFMPEG FREETYPE LAME LIBASS LIBDCA \
ifeq (,$(filter $(HOST.system),darwin cygwin mingw)) ifeq (,$(filter $(HOST.system),darwin cygwin mingw))
__deps__ += FONTCONFIG __deps__ += FONTCONFIG
endif endif
ifeq (netbsd,$(HOST.system))
__deps__ += LIBJPEGTURBO
endif
$(eval $(call import.MODULE.defs,LIBHB,libhb,$(__deps__))) $(eval $(call import.MODULE.defs,LIBHB,libhb,$(__deps__)))
$(eval $(call import.GCC,LIBHB)) $(eval $(call import.GCC,LIBHB))

7
make/include/main.defs
View File

@ -101,6 +101,9 @@ ifneq (,$(filter $(HOST.system),solaris))
MODULES += contrib/libiconv MODULES += contrib/libiconv
endif endif
ifneq (,$(filter $(HOST.system),netbsd))
MODULES += contrib/libjpeg-turbo
endif
## these must come after contrib since some contrib modules are optional ## these must come after contrib since some contrib modules are optional
MODULES += libhb MODULES += libhb
@ -139,12 +142,12 @@ ifeq (1-gnu,$(FEATURE.gtk)-$(HOST.system))
MODULES += gtk MODULES += gtk
endif endif
ifeq (1-netbsd,$(FEATURE.gtk)-$(BUILD.system)) ifeq (1-netbsd,$(FEATURE.gtk)-$(HOST.system))
## build gtk when gtk+netbsd ## build gtk when gtk+netbsd
MODULES += gtk MODULES += gtk
endif endif
ifeq (1-openbsd,$(FEATURE.gtk)-$(BUILD.system)) ifeq (1-openbsd,$(FEATURE.gtk)-$(HOST.system))
## build gtk when gtk+openbsd ## build gtk when gtk+openbsd
MODULES += gtk MODULES += gtk
endif endif

3
make/python_launcher
View File

@ -1,5 +1,4 @@
#!/bin/sh #!/bin/sh
#
inpath() inpath()
{ {
@ -13,7 +12,7 @@ inpath()
return 1 return 1
} }
for p in python3 python2 python python3.7 python3.6 python2.7 for p in python3 python3.11 python3.10 python3.9 python3.8 python3.7 python3.6 python
do do
if ( inpath $p ); then if ( inpath $p ); then
exec $p "$@" exec $p "$@"