Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (15506458953d993406f053f5e940358b853b4c21)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Arjan Bouter (15506458953d993406f053f5e940358b853b4c21)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (15506458953d993406f053f5e940358b853b4c21)
  • Date: Sat, 1 Aug 2009 13:28:02 -0500
GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

audio-creation/lmms/DEPENDS | 69
++++++++++++++++++++---------------------
audio-creation/lmms/HISTORY | 4 ++
audio-creation/lmms/PRE_BUILD | 3 +
disk/udev/DEPENDS | 14 ++++++--
disk/udev/HISTORY | 3 +
utils/hal/DEPENDS | 25 +++++++++++++-
utils/hal/HISTORY | 3 +
utils/hwdata/HISTORY | 3 +
utils/hwdata/PROVIDES | 2 +
utils/pciutils/BUILD | 2 -
utils/pciutils/DEPENDS | 8 ++++
utils/pciutils/HISTORY | 5 ++
utils/pciutils/PRE_SUB_DEPENDS | 6 +++
utils/pciutils/PROVIDES | 1
utils/pciutils/SUB_DEPENDS | 8 ++++
utils/usbutils/HISTORY | 3 +
utils/usbutils/PROVIDES | 1
utils/xen-tools/HISTORY | 3 +
utils/xen-tools/PRE_BUILD | 3 +
x11-libs/wine/BUILD | 2 +
x11-libs/wine/CONFIGURE | 8 ++++
x11-libs/wine/DEPENDS | 15 ++++----
x11-libs/wine/HISTORY | 6 +++
23 files changed, 148 insertions(+), 49 deletions(-)

New commits:
commit bb596c3746144685faef4299d5442f597096b207
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

wine: added win64 support, but won't build until gcc 4.4.x is available

commit a45ab997b74dc33854e5a312d798f182cdf4ffca
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

hwdata: provides PCIIDS and USBIDS

commit 5c404d949162caa55f9244a43f208f88b82804b6
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

usbutils: provides USBIDS

commit 99703241d41a8f56300877b1061bbe7450d12258
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

hal: use providers for hardware data

commit 47334a6fc68ad6466c8a8cdafa042b30f2defeb6
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

udev: use providers for pci.ids and usb.ids

commit 6b82efbe45c4de4ccb71e8dfbc4bf1fbe97c27b6
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

pciutils: added as PCIIDS provider, made zlib, gtk-doc and dns support
optional.

commit 5f49e3ed382534af1c2913e2c2fa041b023482bb
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

lmms: overhauled DEPENDS and install libs in /usr/lib instead of
/usr/lib64

commit d431a1fea1aa61b29369007a818278dc3a542559
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

xen-tools: install libs in /usr/lib instead of /usr/lib64

diff --git a/audio-creation/lmms/DEPENDS b/audio-creation/lmms/DEPENDS
index 1c06983..40bd3f3 100755
--- a/audio-creation/lmms/DEPENDS
+++ b/audio-creation/lmms/DEPENDS
@@ -1,21 +1,23 @@
depends qt4 &&
-depends g++ &&
depends cmake &&

-# we always want system libs
-depends libsamplerate "-DWANT_SYSTEM_SR=1" &&
-depends libsndfile &&
+# depends vst_sdk2_3 '' '' z-rejected &&

-if [[ $LMMS_VST == "-DWANT_VST=1" ]]; then
- depends vst_sdk2_3 '' '' z-rejected &&
- depends wine
-fi &&
+optional_depends wine \
+ "-DWANT_VST=1" \
+ "-DWANT_VST=0" \
+ "for VST support" &&

optional_depends alsa-lib \
"-DWANT_ALSA=1" \
"-DWANT_ALSA=0" \
"for ALSA sound output" &&

+optional_depends pulseaudio \
+ "-DWANT_PULSEAUDIO=1" \
+ "-DWANT_PULSEAUDIO=0" \
+ "for pulseaudio support" &&
+
optional_depends sdl \
"-DWANT_SDL=1" \
"-DWANT_SDL=0" \
@@ -26,6 +28,27 @@ optional_depends JACK-DRIVER \
"-DWANT_JACK=0" \
"for JACK transport" &&

+optional_depends libsndfile \
+ "-DWANT_SYSTEM_SR=1" \
+ "-DWANT_SYSTEM_SR=0" \
+ "Should be optional..." &&
+
+optional_depends libvorbis \
+ "-DWANT_OGGVORBIS=1" \
+ "-DWANT_OGGVORBIS=0" \
+ "for exporting song to OGG files" &&
+
+# I have a spell for this locally but need to test it first
+#optional_depends synthesistoolkit \
+# "-DWANT_STK=1" \
+# "-DWANT_STK=0" \
+# "for Stk (Synthesis Toolkit) support"
+
+optional_depends cmt \
+ "-DWANT_CMT=1" \
+ "-DWANT_CMT=0" \
+ "for LADSPA CMT support" &&
+
optional_depends swh-plugins \
"-DWANT_SWH=1" \
"-DWANT_SWH=0" \
@@ -41,35 +64,13 @@ optional_depends caps-plugins \
"-DWANT_CAPS=0" \
"for LADSPA CAPS plugins support" &&

-optional_depends cmt \
- "-DWANT_CMT=1" \
- "-DWANT_CMT=0" \
- "for LADSPA CMT support" &&
-
-optional_depends libvorbis \
- "-DWANT_OGGVORBIS=1" \
- "-DWANT_OGGVORBIS=0" \
- "for exporting song to OGG files" &&
-
-optional_depends pulseaudio \
- "-DWANT_PULSEAUDIO=1" \
- "-DWANT_PULSEAUDIO=0" \
- "for pulseaudio support" &&
+optional_depends fluidsynth \
+ "-DWANT_SF2=1" \
+ "-DWANT_SF2=0" \
+ "for SpectrumAnalyzer plugin" &&

optional_depends fftw \
"-DWANT_FFTW3F=1" \
"-DWANT_FFTW3F=0" \
- "for SpectrumAnalyzer plugin" &&
-
-optional_depends fluidsynth \
- "-DWANT_SF2=1" \
- "-DWANT_SF2=0" \
"for SpectrumAnalyzer plugin"

-# I have a spell for this locally but need to test it first
-#optional_depends synthesistoolkit \
-# "-DWANT_STK=1" \
-# "-DWANT_STK=0" \
-# "for Stk (Synthesis Toolkit) support"
-
-
diff --git a/audio-creation/lmms/HISTORY b/audio-creation/lmms/HISTORY
index 4c24c51..90c9907 100644
--- a/audio-creation/lmms/HISTORY
+++ b/audio-creation/lmms/HISTORY
@@ -1,3 +1,7 @@
+2009-08-01 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD: added, install in lib instead of lib64
+ * DEPENDS: overhauled
+
2009-01-09 Arjan Bouter <abouter AT sourcemage.org>
* BUILD: switched to qt4_cmake_build to actually build

diff --git a/audio-creation/lmms/PRE_BUILD b/audio-creation/lmms/PRE_BUILD
new file mode 100755
index 0000000..0d38faa
--- /dev/null
+++ b/audio-creation/lmms/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+sedit 's/lib64/lib/' cmake/modules/DetectMachine.cmake
diff --git a/disk/udev/DEPENDS b/disk/udev/DEPENDS
index 3f8a377..ac9903e 100755
--- a/disk/udev/DEPENDS
+++ b/disk/udev/DEPENDS
@@ -7,11 +7,19 @@ if list_find "$UDEV_OPTS" "--enable-extras"; then
depends pkgconfig &&
depends glib2 &&
depends libusb &&
- depends usbutils &&
- depends hwdata &&
- depends libxslt
+ depends USBIDS &&
+ depends PCIIDS
fi &&

+if [[ "$(get_spell_provider ${SPELL} PCIIDS)" = 'pciutils' ]]; then
+ depends -sub NO_ZLIB pciutils
+fi &&
+
+optional_depends gtk-doc \
+ "--enable-gtk-doc" \
+ "--disable-gtk-doc" \
+ "build and install documentation?" &&
+
optional_depends libselinux \
"--with-selinux" \
"--without-selinux" \
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index 486670a..d94f6cc 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,6 @@
+2009-08-01 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: depend on providers instead of spells
+
2009-07-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 145

diff --git a/utils/hal/DEPENDS b/utils/hal/DEPENDS
index e1df381..1cc0368 100755
--- a/utils/hal/DEPENDS
+++ b/utils/hal/DEPENDS
@@ -48,9 +48,28 @@ optional_depends libusb \
"for libusb support" &&

optional_depends hwdata \
- "--with-hwdata=/usr/share/hwdata" \
- "--without-hwdata" \
- "for PCI/USB hardware data" &&
+ "--enable-pnp-ids" \
+ "--disable-pnp-ids" \
+ "for PNP hardware data" &&
+
+optional_depends PCIIDS \
+ "--enable-pci-ids" \
+ "--disable-pci-ids" \
+ "for PCI hardware data" &&
+
+optional_depends USBIDS \
+ "--enable-usb-ids" \
+ "--disable-usb-ids" \
+ "for USB hardware data" &&
+
+if (is_depends_enabled $SPELL hwdata) || \
+ [[ "$(get_spell_provider ${SPELL} PCIIDS)" = 'hwdata' ]] || \
+ [[ "$(get_spell_provider ${SPELL} USBIDS)" = 'hwdata' ]]; then
+ OPTS="${OPTS} --with-hwdata=/usr/share/hwdata"
+elif [[ "$(get_spell_provider ${SPELL} PCIIDS)" = 'pciutils' ]] || \
+ [[ "$(get_spell_provider ${SPELL} USBIDS)" = 'usbutils' ]]; then
+ OPTS="${OPTS} --with-hwdata=/usr/share"
+fi &&

optional_depends pciutils \
"--with-macbookpro" \
diff --git a/utils/hal/HISTORY b/utils/hal/HISTORY
index 0e1ef05..37414a2 100644
--- a/utils/hal/HISTORY
+++ b/utils/hal/HISTORY
@@ -1,3 +1,6 @@
+2009-08-01 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: use providers for usb.ids and pci.ids
+
2009-07-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.5.13
* PRE_BUILD, fstype.patch: removed patch
diff --git a/utils/hwdata/HISTORY b/utils/hwdata/HISTORY
index 88340a8..fda9e98 100644
--- a/utils/hwdata/HISTORY
+++ b/utils/hwdata/HISTORY
@@ -1,3 +1,6 @@
+2009-08-01 Arjan Bouter <abouter AT sourcemage.org>
+ * PROVIDES: added
+
2009-04-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version git
new website and url
diff --git a/utils/hwdata/PROVIDES b/utils/hwdata/PROVIDES
new file mode 100755
index 0000000..99160d0
--- /dev/null
+++ b/utils/hwdata/PROVIDES
@@ -0,0 +1,2 @@
+PCIIDS
+USBIDS
diff --git a/utils/pciutils/BUILD b/utils/pciutils/BUILD
index d558f71..4ebf4f7 100755
--- a/utils/pciutils/BUILD
+++ b/utils/pciutils/BUILD
@@ -1 +1 @@
-make PREFIX="$INSTALL_ROOT/usr" SHARED=yes OPT="$CFLAGS"
+make PREFIX="$INSTALL_ROOT/usr" SHARED=yes ${OPTS} OPT="$CFLAGS"
diff --git a/utils/pciutils/DEPENDS b/utils/pciutils/DEPENDS
index f6febdf..d26b1cf 100755
--- a/utils/pciutils/DEPENDS
+++ b/utils/pciutils/DEPENDS
@@ -1,4 +1,10 @@
if [[ $PCIUTILS_UPDATE == y ]]; then
depends $PCIUTILS_DOWNLOADER &&
depends which
-fi
+fi &&
+
+optional_depends zlib 'ZLIB=yes' 'ZLIB=no' \
+ 'compress pci.ids?' &&
+
+optional_depends glibc 'DNS=yes' 'DNS=no' \
+ "Enable querying the central database of PCI ID's using
DNS?"
diff --git a/utils/pciutils/HISTORY b/utils/pciutils/HISTORY
index eec5f1a..4df537d 100644
--- a/utils/pciutils/HISTORY
+++ b/utils/pciutils/HISTORY
@@ -1,3 +1,8 @@
+2009-08-01 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: added optional deps on zlib and glibc
+ * (PRE_)SUB_DEPENDS: added to enable use of pci.ids by udev
+ * PROVIDES: added
+
2009-07-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.1.3

diff --git a/utils/pciutils/PRE_SUB_DEPENDS b/utils/pciutils/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..6173944
--- /dev/null
+++ b/utils/pciutils/PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ ZLIB) is_depends_enabled $SPELL zlib;;
+ NO_ZLIB) is_depends_enabled $SPELL zlib && return 1;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/utils/pciutils/PROVIDES b/utils/pciutils/PROVIDES
new file mode 100755
index 0000000..9f4c02d
--- /dev/null
+++ b/utils/pciutils/PROVIDES
@@ -0,0 +1 @@
+PCIIDS
diff --git a/utils/pciutils/SUB_DEPENDS b/utils/pciutils/SUB_DEPENDS
new file mode 100755
index 0000000..bb8ce32
--- /dev/null
+++ b/utils/pciutils/SUB_DEPENDS
@@ -0,0 +1,8 @@
+case $THIS_SUB_DEPENDS in
+ ZLIB) message "pciutils with zlib requested, forcing enabled zlib
dependency" &&
+ depends zlib "ZLIB=yes" ;;
+ NO_ZLIB) message "pciutils without zlib requested, forcing disabled zlib
dependency" &&
+ depends zlib "ZLIB=no" ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1 ;;
+esac
diff --git a/utils/usbutils/HISTORY b/utils/usbutils/HISTORY
index 68644e3..220c953 100644
--- a/utils/usbutils/HISTORY
+++ b/utils/usbutils/HISTORY
@@ -1,3 +1,6 @@
+2009-08-01 Arjan Bouter <abouter AT sourcemage.org>
+ * PROVIDES: added
+
2009-06-25 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.84

diff --git a/utils/usbutils/PROVIDES b/utils/usbutils/PROVIDES
new file mode 100755
index 0000000..65f0ea5
--- /dev/null
+++ b/utils/usbutils/PROVIDES
@@ -0,0 +1 @@
+USBIDS
diff --git a/utils/xen-tools/HISTORY b/utils/xen-tools/HISTORY
index 2ed5776..958c181 100644
--- a/utils/xen-tools/HISTORY
+++ b/utils/xen-tools/HISTORY
@@ -1,3 +1,6 @@
+2009-07-31 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD: added, install into lib instead of lib64
+
2009-07-30 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 3.4.0

diff --git a/utils/xen-tools/PRE_BUILD b/utils/xen-tools/PRE_BUILD
new file mode 100755
index 0000000..ec51a92
--- /dev/null
+++ b/utils/xen-tools/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+sedit 's/lib64/lib/' config/StdGNU.mk
diff --git a/x11-libs/wine/BUILD b/x11-libs/wine/BUILD
index 8124c38..747ce63 100755
--- a/x11-libs/wine/BUILD
+++ b/x11-libs/wine/BUILD
@@ -9,6 +9,8 @@ if grep -q "\-O3" <<< $CFLAGS; then
CXXFLAGS="-fno-guess-branch-probability $CXXFLAGS"
fi &&

+OPTS="${OPTS} ${WINE64}" &&
+
default_build &&

if is_depends_enabled $SPELL docbook-utils; then
diff --git a/x11-libs/wine/CONFIGURE b/x11-libs/wine/CONFIGURE
new file mode 100755
index 0000000..a881b15
--- /dev/null
+++ b/x11-libs/wine/CONFIGURE
@@ -0,0 +1,8 @@
+ARCH="$(uname -m)" &&
+if [[ "${ARCH}" = 'x86_64' ]]; then
+ message "Wine64 does NOT run 32bit apps. You can, however, build a 64bit
Wine." &&
+ message "Probably this is not what you want. If you say 'n' to the next
question" &&
+ message "an attempt will be made to build a 32bit Wine, which will fail if
you" &&
+ message "do not have a multilib system." &&
+ config_query_option WINE64 'Build a 64bit Wine?' n '--enable-win64
--enable-maintainer-mode' ''
+fi
diff --git a/x11-libs/wine/DEPENDS b/x11-libs/wine/DEPENDS
index c90a0af..f5809bc 100755
--- a/x11-libs/wine/DEPENDS
+++ b/x11-libs/wine/DEPENDS
@@ -71,9 +71,9 @@ optional_depends libpng \
'--without-png' \
'for PNG image support' &&

-optional_depends libxslt \
- '--with-xslt' \
- '--without-xslt' \
+optional_depends libxslt \
+ '--with-xslt --with-xml' \
+ '--without-xslt --without-xml' \
'for a functional Microsoft XML (MSXML) implementation' &&

optional_depends MSTTF \
@@ -88,10 +88,11 @@ optional_depends nas \
'for NAS audio support' &&

# the --with-curses option fails
-optional_depends ncurses \
- "" \
- "--without-curses" \
- "curses gui?" &&
+# because it can't find libncurses
+#optional_depends ncurses \
+# "" \
+# "--without-curses" \
+# "curses gui?" &&

optional_depends OPENGL \
'--with-opengl' \
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index d01d62e..727727c 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,9 @@
+2009-08-01 Arjan Bouter <abouter AT sourcemage.org>
+ * BUILD,CONFIGURE: added wine64 (fixes bug #11336)
+ * DEPENDS: completed optional dep on libxslt and commented out the
+ optional dep on ncurses as that fails to find libncurses and would
+ break the spell.
+
2009-07-17 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.1.26



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (15506458953d993406f053f5e940358b853b4c21), Arjan Bouter, 08/01/2009

Archive powered by MHonArc 2.6.24.

Top of Page