Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (f3f78d76c9a9fefc7984f9d4c6d7b0fe60e02ab0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (f3f78d76c9a9fefc7984f9d4c6d7b0fe60e02ab0)
  • Date: Wed, 14 Aug 2019 16:39:18 +0000

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

python-pypi/mako/BUILD | 7 +++++++
python-pypi/mako/HISTORY | 5 +++++
python-pypi/mako/INSTALL | 7 +++++++
utils/qemu/CONFIGURE | 6 +++---
utils/qemu/DEPENDS | 23 +++++++----------------
utils/qemu/HISTORY | 8 ++++++++
utils/qemu/PRE_BUILD | 23 ++++++++++++++++-------
7 files changed, 53 insertions(+), 26 deletions(-)

New commits:
commit f3f78d76c9a9fefc7984f9d4c6d7b0fe60e02ab0
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

qemu: These are quick fixes, I need this recompiled for the updated
nettle 3.5 that broke compatibility.

Dependencies changed since 2.11
Optionally uses gtk+3 >= 3.16 now. gtk+2 is not an option, there is no
gtkabi parameter anymore.
Use list_find instead of case to more reliably check for "--enable-docs"
No pci.mak nor sound.mak, nor are they included, so just write
the configs out for now instead of sed, but they do nothing.

commit df1847af0cab9aa11a9372c2c548c913c5a2759a
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

mako: Allow sub depend PYTHON3 to override Python (v2) dependency.

May want to change python-pypi/FUNCTIONS to do similar (reverse if/else
logic)?
There can be only one.
If mako was built against python (v2) and then someone (mesa) requests it
to be built against python3, sure the dependencies will be updated, but
python-pypi/FUNCTIONS will only build/install against the python (v2)
libraries.

diff --git a/python-pypi/mako/BUILD b/python-pypi/mako/BUILD
new file mode 100755
index 0000000..102c8d3
--- /dev/null
+++ b/python-pypi/mako/BUILD
@@ -0,0 +1,7 @@
+# If Python3 build is specifically requested (e.g. mesa), build that instead
+# Can only build/install one python-version bound mako
+if is_depends_enabled $SPELL python3; then
+ default_build_python3
+else
+ default_build_python
+fi
diff --git a/python-pypi/mako/HISTORY b/python-pypi/mako/HISTORY
index de3b668..58b2ab9 100644
--- a/python-pypi/mako/HISTORY
+++ b/python-pypi/mako/HISTORY
@@ -1,3 +1,8 @@
+2019-08-09 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD,INSTALL: Allow sub depend PYTHON3 to override Python install.
+ May want to change python-pypi/FUNCTIONS to do similar (reverse
if/else logic)?
+ There can be only one.
+
2019-08-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.1.0

diff --git a/python-pypi/mako/INSTALL b/python-pypi/mako/INSTALL
new file mode 100755
index 0000000..bdd1f08
--- /dev/null
+++ b/python-pypi/mako/INSTALL
@@ -0,0 +1,7 @@
+# If Python3 build is specifically requested (e.g. mesa), build that instead
+# Can only build/install one python-version bound mako
+if is_depends_enabled $SPELL python3; then
+ default_install_python3
+else
+ default_install_python
+fi
diff --git a/utils/qemu/CONFIGURE b/utils/qemu/CONFIGURE
index 2d13d07..1c00310 100755
--- a/utils/qemu/CONFIGURE
+++ b/utils/qemu/CONFIGURE
@@ -44,7 +44,7 @@ config_query_option QEMU_OPTS "Enable VNC support?" y \
config_query_multi QEMU_VNC_TLS "Enable TLS encryption in VNC?" 'none'
'nettle' 'gcrypt' &&

config_query_option QEMU_OPTS \
- 'Build documentation? (requires: perl, python, texinfo)' y \
- '--enable-docs' \
- '--disable-docs'
+ 'Build documentation? (requires: perl, python, texinfo)'
y \
+ '--enable-docs' \
+ '--disable-docs'

diff --git a/utils/qemu/DEPENDS b/utils/qemu/DEPENDS
index 0d11003..2d733a2 100755
--- a/utils/qemu/DEPENDS
+++ b/utils/qemu/DEPENDS
@@ -16,31 +16,22 @@ if list_find "esd" $QEMU_AUDIO; then
depends esound
fi &&

-case "$QEMU_OPTS" in *--enable-docs*)
+if list_find '--enable-docs' ${QEMU_OPTS}; then
depends texinfo &&
depends python-sphinx &&
depends perl &&
depends podlators
-esac &&
+fi &&

+optional_depends gtk+3 \
+ '--enable-gtk' \
+ '--disable-gtk' \
+ 'for GTK+ 3.x UI' &&

-optional_depends gtk+3 \
- '--enable-gtk --with-gtkabi=3.0' \
- '' \
- 'for GTK+ 3.x UI'
if is_depends_enabled $SPELL gtk+3; then
optional_depends vte3 '--enable-vte' '--disable-vte' \
'VTE support for the GTK+ UI'
-else
- optional_depends gtk+2 \
- '--enable-gtk --with-gtkabi=2.0' \
- '--disable-gtk' \
- 'for GTK+ 2.x UI' &&
- if is_depends_enabled $SPELL gtk+2; then
- optional_depends vte '--enable-vte' '--disable-vte' \
- 'VTE support for the GTK+ UI'
- fi
-fi
+fi &&

optional_depends sdl2 \
'--enable-sdl' \
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index f187dbc..0c67bf0 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,11 @@
+2019-08-09 Eric Sandall <sandalle AT sourcemage.org>
+ * These are quick fixes, I need this recompiled for the updated
nettle 3.5 that broke compatibility.
+ * DEPENDS: Dependencies changed since 2.11
+ Optionally uses gtk+3 >= 3.16 now. gtk+2 is not an option, there is
no gtkabi parameter anymore.
+ Use list_find instead of case to more reliably check for
"--enable-docs"
+ * PRE_BUILD: No pci.mak nor sound.mak, nor are they included, so just
write
+ the configs out for now instead of sed, but they do nothing.
+
2019-05-30 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 4.0.0
* DEPENDS: removed SDL 1.x, not supported anymore
diff --git a/utils/qemu/PRE_BUILD b/utils/qemu/PRE_BUILD
index bb85363..547eddb 100755
--- a/utils/qemu/PRE_BUILD
+++ b/utils/qemu/PRE_BUILD
@@ -2,32 +2,41 @@ default_pre_build &&

# Configure selected sound cards
# Defaults are enabled in the configs, so only disable if not selected
+# There are no pci.mak nor sound.mak files nor does any *.mak include them,
even though docs/devel/build-system.txt says x86_64-softmmu.mak does as an
example and running sed on a non-existent file returns an error.
+# So this really does nothing, but I just need QEMU to compile so I can run
some headless and soundless VMs. :)
if ! list_find "${QEMU_CARDS}" "ac97"; then
- sedit 's:CONFIG_AC97=y:CONFIG_AC97=n:'
"${SOURCE_DIRECTORY}"/default-configs/pci.mak
+ #sedit 's:CONFIG_AC97=y:CONFIG_AC97=n:'
"${SOURCE_DIRECTORY}"/default-configs/pci.mak
+ echo 'CONFIG_AC97=n' >> "${SOURCE_DIRECTORY}"/default-configs/pci.mak
fi &&

if ! list_find "${QEMU_CARDS}" "adlib"; then
- sedit 's:CONFIG_ADLIB=y:CONFIG_ADLIB=n:'
"${SOURCE_DIRECTORY}"/default-configs/sound.mak
+# sedit 's:CONFIG_ADLIB=y:CONFIG_ADLIB=n:'
"${SOURCE_DIRECTORY}"/default-configs/sound.mak
+ echo 'CONFIG_ADLIB=n' >> "${SOURCE_DIRECTORY}"/default-configs/pci.mak
fi &&

if ! list_find "${QEMU_CARDS}" "cs4231a"; then
- sedit 's:CONFIG_CS4231A=y:CONFIG_CS4231A=n:'
"${SOURCE_DIRECTORY}"/default-configs/sound.mak
+# sedit 's:CONFIG_CS4231A=y:CONFIG_CS4231A=n:'
"${SOURCE_DIRECTORY}"/default-configs/sound.mak
+ echo 'CONFIG_CS4231A=n' >> "${SOURCE_DIRECTORY}"/default-configs/pci.mak
fi &&

if ! list_find "${QEMU_CARDS}" "es1370"; then
- sedit 's:CONFIG_ES1370=y:CONFIG_ES1370=n:'
"${SOURCE_DIRECTORY}"/default-configs/pci.mak
+# sedit 's:CONFIG_ES1370=y:CONFIG_ES1370=n:'
"${SOURCE_DIRECTORY}"/default-configs/pci.mak
+ echo 'CONFIG_ES1370=n' >> "${SOURCE_DIRECTORY}"/default-configs/pci.mak
fi &&

if ! list_find "${QEMU_CARDS}" "gus"; then
- sedit 's:CONFIG_GUS=y:CONFIG_GUS=n:'
"${SOURCE_DIRECTORY}"/default-configs/sound.mak
+# sedit 's:CONFIG_GUS=y:CONFIG_GUS=n:'
"${SOURCE_DIRECTORY}"/default-configs/sound.mak
+ echo 'CONFIG_GUS=n' >> "${SOURCE_DIRECTORY}"/default-configs/pci.mak
fi &&

if ! list_find "${QEMU_CARDS}" "hda"; then
- sedit 's:CONFIG_HDA=y:CONFIG_HDA=n:'
"${SOURCE_DIRECTORY}"/default-configs/pci.mak
+# sedit 's:CONFIG_HDA=y:CONFIG_HDA=n:'
"${SOURCE_DIRECTORY}"/default-configs/pci.mak
+ echo 'CONFIG_HDA=n' >> "${SOURCE_DIRECTORY}"/default-configs/pci.mak
fi &&

if ! list_find "${QEMU_CARDS}" "sb16"; then
- sedit 's:CONFIG_SB16=y:CONFIG_SB16=n:'
"${SOURCE_DIRECTORY}"/default-configs/sound.mak
+# sedit 's:CONFIG_SB16=y:CONFIG_SB16=n:'
"${SOURCE_DIRECTORY}"/default-configs/sound.mak
+ echo 'CONFIG_SB16=n' >> "${SOURCE_DIRECTORY}"/default-configs/pci.mak
fi &&

cd "${SOURCE_DIRECTORY}" &&



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (f3f78d76c9a9fefc7984f9d4c6d7b0fe60e02ab0), Eric Sandall, 08/14/2019

Archive powered by MHonArc 2.6.24.

Top of Page