Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

audacious, audacious-plugins, dstat, feh, gtk-nodoka-engine, highligh…

…t, inkscape, john, klavaro, libdbusmenu-qt, mpc, mpd, obexd, podofo, qbittorrent, ruby, scons, sqlite, squid, system-config-printer, xorg-server
  • Loading branch information...
commit ea89407cf4f6650317c856bf0145db95c9abd715 1 parent df7e4b2
Phantom X authored
Showing with 2,971 additions and 568 deletions.
  1. +108 −0 ChangeLog.All
  2. +4 −0 audacious-plugins/ChangeLog.SB
  3. +3 −1 audacious-plugins/audacious-plugins.SlackBuild
  4. +4 −0 audacious/ChangeLog.SB
  5. +1 −1  audacious/audacious.SlackBuild
  6. +4 −0 dstat/ChangeLog.SB
  7. +10 −0 dstat/apply-patches.sh
  8. +11 −6 dstat/dstat.SlackBuild
  9. 0  dstat/{ → patches}/dstat-0.6.8-dbus.patch.gz
  10. +106 −0 dstat/patches/dstat-0.7.2-bits.patch
  11. +4 −0 feh/ChangeLog.SB
  12. +1 −1  feh/feh.SlackBuild
  13. +4 −0 file/ChangeLog.SB
  14. +1 −0  file/apply-patches.sh
  15. +1 −1  file/file.SlackBuild
  16. +16 −0 file/patches/file-5.04-webm.patch
  17. +4 −0 game-music-emu/ChangeLog.SB
  18. +2 −0  game-music-emu/apply-patches.sh
  19. +16 −2 game-music-emu/game-music-emu.SlackBuild
  20. +491 −0 game-music-emu/patches/01_symbol-exports.patch
  21. +4 −0 gnome/empathy/ChangeLog.SB
  22. +7 −4 gnome/empathy/empathy.SlackBuild
  23. +4 −0 gnome/system-config-printer/ChangeLog.SB
  24. +1 −1  gnome/system-config-printer/system-config-printer.SlackBuild
  25. +4 −0 highlight/ChangeLog.SB
  26. +1 −1  highlight/highlight.SlackBuild
  27. +4 −0 inkscape/ChangeLog.SB
  28. +1 −6 inkscape/apply-patches.sh
  29. +2 −2 inkscape/inkscape.SlackBuild
  30. +0 −81 inkscape/patches/inkscape-0.47-gcc45.patch
  31. BIN  inkscape/patches/inkscape-0.47-poppler-0.12.2.patch.gz
  32. +72 −0 inkscape/patches/inkscape-0.48-newpoppler.patch
  33. BIN  inkscape/patches/inkscape-20090410svn-uniconv.patch.gz
  34. BIN  inkscape/patches/inkscape-20090925svn-el5.patch.gz
  35. +4 −0 john/ChangeLog.SB
  36. +1 −1  john/john.SlackBuild
  37. +4 −0 kde-apps/kde-servicemenu-pdf/ChangeLog.SB
  38. +1 −1  kde-apps/kde-servicemenu-pdf/kde-servicemenu-pdf.SlackBuild
  39. +4 −0 klavaro/ChangeLog.SB
  40. +4 −8 klavaro/klavaro.SlackBuild
  41. +4 −0 libdbusmenu-qt/ChangeLog.SB
  42. +1 −1  libdbusmenu-qt/apply-patches.sh
  43. +1 −2  libdbusmenu-qt/libdbusmenu-qt.SlackBuild
  44. +0 −11 libdbusmenu-qt/patches/dbusmenu-qt-0.3.2-pkgconfig.patch
  45. +4 −0 libsndfile/ChangeLog.SB
  46. +7 −3 libsndfile/libsndfile-compat32.SlackBuild
  47. +32 −3 libsndfile/libsndfile.SlackBuild
  48. +4 −0 mpc/ChangeLog.SB
  49. +214 −0 mpc/mpc.SlackBuild
  50. +12 −0 mpc/slack-desc
  51. +1 −0  mpc/slack-required
  52. +8 −0 mpd/ChangeLog.SB
  53. +20 −8 mpd/mpd.SlackBuild
  54. +8 −1 mpd/slack-required
  55. +4 −0 mpdscribble/ChangeLog.SB
  56. +47 −6 mpdscribble/mpdscribble.SlackBuild
  57. +9 −2 mpdscribble/rc.mpdscribble
  58. +4 −0 mpdsetup/ChangeLog.SB
  59. +39 −0 mpdsetup/mpdsetup-snapshot.sh
  60. +221 −0 mpdsetup/mpdsetup.SlackBuild
  61. +12 −0 mpdsetup/slack-desc
  62. +7 −0 mpdsetup/slack-required
  63. +4 −0 nodoka/gtk-nodoka-engine/ChangeLog.SB
  64. +6 −5 nodoka/gtk-nodoka-engine/apply-patches.sh
  65. +6 −5 nodoka/gtk-nodoka-engine/gtk-nodoka-engine.SlackBuild
  66. BIN  nodoka/gtk-nodoka-engine/patches/gtk-nodoka-engine-0.7.2-grey-out-checkboxes.patch.gz
  67. BIN  nodoka/gtk-nodoka-engine/patches/gtk-nodoka-engine-0.7.2-missing-widget-check.patch.gz
  68. BIN  nodoka/gtk-nodoka-engine/patches/gtk-nodoka-engine-handle-selection.patch.gz
  69. BIN  nodoka/gtk-nodoka-engine/patches/gtk-nodoka-engine-scale-trough.patch.gz
  70. +9 −0 nvidia-glx/nvidia-glx.SlackBuild
  71. +4 −0 obexd/ChangeLog.SB
  72. +1 −1  obexd/obexd.SlackBuild
  73. +4 −0 podofo/ChangeLog.SB
  74. +1 −1  podofo/podofo.SlackBuild
  75. +4 −0 python-modules/pysmbc/ChangeLog.SB
  76. +11 −3 python-modules/pysmbc/pysmbc.SlackBuild
  77. +4 −0 python-modules/python-lepl/ChangeLog.SB
  78. +188 −0 python-modules/python-lepl/python-lepl.SlackBuild
  79. +12 −0 python-modules/python-lepl/slack-desc
  80. +1 −0  python-modules/python-lepl/slack-required
  81. +4 −0 python-modules/python-mpd-twisted/ChangeLog.SB
  82. +40 −0 python-modules/python-mpd-twisted/python-mpd-twisted-snapshot.sh
  83. +198 −0 python-modules/python-mpd-twisted/python-mpd-twisted.SlackBuild
  84. +12 −0 python-modules/python-mpd-twisted/slack-desc
  85. +2 −0  python-modules/python-mpd-twisted/slack-required
  86. +4 −0 python-modules/python-mpd/ChangeLog.SB
  87. +22 −14 python-modules/python-mpd/python-mpd.SlackBuild
  88. +4 −0 python-modules/sk1libs/ChangeLog.SB
  89. +203 −0 python-modules/sk1libs/sk1libs.SlackBuild
  90. +12 −0 python-modules/sk1libs/slack-desc
  91. +6 −0 python-modules/sk1libs/slack-required
  92. +1 −0  python-modules/uniconvertor/slack-required
  93. +4 −0 qbittorrent/ChangeLog.SB
  94. +1 −1  qbittorrent/qbittorrent.SlackBuild
  95. +1 −1  realplayer/realplayer.SlackBuild
  96. +4 −0 ruby/ChangeLog.SB
  97. +2 −2 ruby/ruby.SlackBuild
  98. +4 −0 scons/ChangeLog.SB
  99. +1 −1  scons/scons.SlackBuild
  100. +4 −0 sqlite/ChangeLog.SB
  101. +1 −1  sqlite/sqlite-compat32.SlackBuild
  102. +1 −1  sqlite/sqlite.SlackBuild
  103. +4 −0 squid/ChangeLog.SB
  104. +0 −3  squid/apply-patches.sh
  105. +0 −11 squid/patches/squid-3.1.6-external-dns.patch
  106. +5 −5 squid/squid.SlackBuild
  107. +5 −0 tigervnc/ChangeLog.SB
  108. +8 −4 tigervnc/tigervnc.SlackBuild
  109. +1 −1  xorg/xf86-input-joystick/xf86-input-joystick.SlackBuild
  110. +4 −0 xorg/xf86-video-nouveau/ChangeLog.SB
  111. +4 −0 xorg/xorg-server/ChangeLog.SB
  112. +11 −12 xorg/xorg-server/apply-patches.sh
  113. +48 −0 xorg/xorg-server/patches/xserver-1.4.99-ssh-isnt-local.patch
  114. BIN  xorg/xorg-server/patches/xserver-1.4.99-ssh-isnt-local.patch.gz
  115. +23 −23 xorg/xorg-server/patches/xserver-1.5.0-bg-none-root.patch
  116. +32 −0 xorg/xorg-server/patches/xserver-1.5.0-projector-fb-size.patch
  117. BIN  xorg/xorg-server/patches/xserver-1.5.0-projector-fb-size.patch.gz
  118. +26 −0 xorg/xorg-server/patches/xserver-1.5.1-mode-debug.patch
  119. BIN  xorg/xorg-server/patches/xserver-1.5.1-mode-debug.patch.gz
  120. +172 −0 xorg/xorg-server/patches/xserver-1.6.0-displayfd.patch
  121. BIN  xorg/xorg-server/patches/xserver-1.6.0-displayfd.patch.gz
  122. +31 −0 xorg/xorg-server/patches/xserver-1.6.0-less-acpi-brokenness.patch
  123. BIN  xorg/xorg-server/patches/xserver-1.6.0-less-acpi-brokenness.patch.gz
  124. +21 −22 xorg/xorg-server/patches/xserver-1.6.1-nouveau.patch
  125. +7 −16 xorg/xorg-server/patches/xserver-1.6.99-default-modes.patch
  126. +23 −28 xorg/xorg-server/patches/xserver-1.6.99-right-of.patch
  127. +9 −9 xorg/xorg-server/patches/xserver-1.7.0-randr-gamma-restore.patch
  128. +34 −0 xorg/xorg-server/patches/xserver-1.7.1-gamma-kdm-fix.patch
  129. BIN  xorg/xorg-server/patches/xserver-1.7.1-gamma-kdm-fix.patch.gz
  130. +55 −0 xorg/xorg-server/patches/xserver-1.7.1-multilib.patch
  131. BIN  xorg/xorg-server/patches/xserver-1.7.1-multilib.patch.gz
  132. +0 −142 xorg/xorg-server/patches/xserver-1.8-no-connected-outputs.patch
  133. +0 −35 xorg/xorg-server/patches/xserver-1.8-randr-initial.patch
  134. +0 −20 xorg/xorg-server/patches/xserver-1.8.0-force-hal-disable.patch
  135. +27 −0 xorg/xorg-server/patches/xserver-1.8.0-no-xorg.patch
  136. +20 −0 xorg/xorg-server/patches/xserver-1.9.0-force-hal-disable.patch
  137. +7 −3 xorg/xorg-server/xorg-server.SlackBuild
  138. +40 −44 xorg/xorg-server/xvfb-run.sh
108 ChangeLog.All
View
@@ -1,3 +1,111 @@
+Thu Aug 26 02:04:54 BRT 2010
+sk1libs-0.9.1-x86_64-1xinc.tgz
++--------------------------+
+Thu Aug 26 01:44:51 BRT 2010
+inkscape-0.48.0-x86_64-1xinc.tgz
++--------------------------+
+Wed Aug 25 20:10:09 BRT 2010
+audacious-plugins-2.4.0-x86_64-1xinc.tgz
++--------------------------+
+Wed Aug 25 20:09:14 BRT 2010
+audacious-2.4.0-x86_64-1xinc.tgz
++--------------------------+
+Wed Aug 25 19:42:25 BRT 2010
+podofo-0.8.2-x86_64-1xinc.tgz
++--------------------------+
+Wed Aug 25 19:17:39 BRT 2010
+libsndfile-1.0.21-x86_64-2xinc.tgz
++--------------------------+
+Wed Aug 25 19:05:21 BRT 2010
+game-music-emu-0.5.5-x86_64-2xinc.tgz
++--------------------------+
+Wed Aug 25 18:41:18 BRT 2010
+mpd-0.16_alpha2-x86_64-1xinc.tgz
++--------------------------+
+Wed Aug 25 18:24:04 BRT 2010
+mpc-0.19-x86_64-1xinc.tgz
++--------------------------+
+Wed Aug 25 18:17:07 BRT 2010
+dstat-0.7.2-noarch-1xinc.tgz
++--------------------------+
+Wed Aug 25 18:11:38 BRT 2010
+file-5.04-x86_64-5xinc.tgz
++--------------------------+
+Wed Aug 25 17:30:54 BRT 2010
+squid-3.1.7-x86_64-1xinc.tgz
++--------------------------+
+Wed Aug 25 16:51:53 BRT 2010
+mpdsetup-20100825-x86_64-1xinc.tgz
++--------------------------+
+Wed Aug 25 16:14:36 BRT 2010
+python-mpd-twisted-20100825-x86_64-1xinc.tgz
++--------------------------+
+Wed Aug 25 15:54:06 BRT 2010
+python-lepl-4.3.2-x86_64-1xinc.tgz
++--------------------------+
+Wed Aug 25 15:33:34 BRT 2010
+python-mpd-0.2.1-x86_64-2xinc.tgz
++--------------------------+
+Wed Aug 25 14:26:04 BRT 2010
+mpdscribble-0.19-x86_64-2xinc.tgz
++--------------------------+
+Wed Aug 25 12:10:19 BRT 2010
+highlight-3.1-x86_64-1xinc.tgz
++--------------------------+
+Wed Aug 25 01:58:57 BRT 2010
+system-config-printer-1.2.4-x86_64-1xinc.tgz
++--------------------------+
+Tue Aug 24 21:36:20 BRT 2010
+mpd-0.15.12-x86_64-1xinc.tgz
++--------------------------+
+Tue Aug 24 20:42:25 BRT 2010
+kde-servicemenu-pdf-0.4-noarch-1xinc.tgz
++--------------------------+
+Tue Aug 24 20:39:58 BRT 2010
+feh-1.9-x86_64-1xinc.tgz
++--------------------------+
+Tue Aug 24 20:37:21 BRT 2010
+klavaro-1.7.0-x86_64-1xinc.tgz
++--------------------------+
+Tue Aug 24 20:35:16 BRT 2010
+xf86-video-nouveau-20100824-x86_64-1xinc.tgz
++--------------------------+
+Tue Aug 24 19:49:43 BRT 2010
+tigervnc-20100824-x86_64-1xinc.tgz
++--------------------------+
+Tue Aug 24 19:45:26 BRT 2010
+xorg-server-1.9.0-x86_64-1xinc.tgz
++--------------------------+
+Tue Aug 24 18:34:06 BRT 2010
+ruby-1.9.2.p0-x86_64-1xinc.tgz
++--------------------------+
+Tue Aug 24 18:29:25 BRT 2010
+libdbusmenu-qt-0.6.0-x86_64-1xinc.tgz
++--------------------------+
+Tue Aug 24 18:05:27 BRT 2010
+john-1.7.6-x86_64-1xinc.tgz
++--------------------------+
+Tue Aug 24 12:47:41 BRT 2010
+empathy-2.30.3-x86_64-1xinc.tgz
++--------------------------+
+Tue Aug 24 12:39:18 BRT 2010
+scons-2.0.1-x86_64-1xinc.tgz
++--------------------------+
+Tue Aug 24 12:37:43 BRT 2010
+pysmbc-1.0.9-x86_64-1xinc.tgz
++--------------------------+
+Tue Aug 24 12:36:31 BRT 2010
+obexd-0.31-x86_64-1xinc.tgz
++--------------------------+
+Tue Aug 24 12:34:54 BRT 2010
+gtk-nodoka-engine-0.7.5-x86_64-1xinc.tgz
++--------------------------+
+Tue Aug 24 12:28:30 BRT 2010
+qbittorrent-2.4.0rc3-x86_64-1xinc.tgz
++--------------------------+
+Tue Aug 24 02:47:08 BRT 2010
+sqlite-3.7.1-x86_64-1xinc.tgz
++--------------------------+
Mon Aug 23 22:14:48 BRT 2010
openssh-5.6p1-x86_64-1xinc.tgz
+--------------------------+
4 audacious-plugins/ChangeLog.SB
View
@@ -1,3 +1,7 @@
+Wed Aug 25 20:10:09 BRT 2010
+audacious-plugins-2.4.0-x86_64-1xinc.tgz:
+Updated to 2.4.0.
++--------------------------+
Mon Aug 23 21:42:15 BRT 2010
audacious-plugins-2.4.rc3-x86_64-1xinc.tgz:
Updated to 2.4-rc3.
4 audacious-plugins/audacious-plugins.SlackBuild
View
@@ -43,7 +43,7 @@ fi
NAME=audacious-plugins
PKG=${PKG:-${TMP}/package-${NAME}}
-VERSION=${VERSION:-2.4-rc3}
+VERSION=${VERSION:-2.4.0}
if [ "${SB_NATIVE}" = "YES" ] ;then
ARCH=${ARCH:-$(uname -m)}
else
@@ -123,6 +123,8 @@ do
done
grep -q -s __RPM_LIB * -R && exit 1
+sed -i -e 's|${PLUGIN_CPPFLAGS}|\0 ${SNDFILE_CFLAGS}|g' src/sndfile/Makefile || exit 1
+
sed -i '\,^.SILENT:,d' buildsys.mk.in
CFLAGS="${SLKCFLAGS}" \
4 audacious/ChangeLog.SB
View
@@ -1,3 +1,7 @@
+Wed Aug 25 20:09:14 BRT 2010
+audacious-2.4.0-x86_64-1xinc.tgz:
+Updated to 2.4.0.
++--------------------------+
Mon Aug 23 21:40:09 BRT 2010
audacious-2.4.rc3-x86_64-1xinc.tgz:
Updated to 2.4-rc3.
2  audacious/audacious.SlackBuild
View
@@ -43,7 +43,7 @@ fi
NAME=audacious
PKG=${PKG:-${TMP}/package-${NAME}}
-VERSION=${VERSION:-2.4-rc3}
+VERSION=${VERSION:-2.4.0}
if [ "${SB_NATIVE}" = "YES" ] ;then
ARCH=${ARCH:-$(uname -m)}
else
4 dstat/ChangeLog.SB
View
@@ -1,3 +1,7 @@
+Wed Aug 25 18:17:07 BRT 2010
+dstat-0.7.2-noarch-1xinc.tgz:
+Updated to 0.7.2.
++--------------------------+
Thu Dec 24 16:40:18 BRST 2009
dstat-0.7.0-noarch-1xinc.tgz:
First SB.
10 dstat/apply-patches.sh
View
@@ -0,0 +1,10 @@
+
+set -e -o pipefail
+
+SB_PATCHDIR=${CWD}/patches
+
+# patch -p0 -E --backup --verbose -i ${SB_PATCHDIR}/${NAME}.patch
+zcat ${SB_PATCHDIR}/dstat-0.6.8-dbus.patch.gz | patch -p1 -E --backup --verbose
+patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/dstat-0.7.2-bits.patch
+
+set +e +o pipefail
17 dstat/dstat.SlackBuild
View
@@ -43,7 +43,7 @@ fi
NAME=dstat
PKG=${PKG:-${TMP}/package-${NAME}}
-VERSION=${VERSION:-0.7.0}
+VERSION=${VERSION:-0.7.2}
ARCH=noarch
SLKTARGET=${SLKTARGET:-i486}
SLKDTARGET=${SLKDTARGET:-slackware}
@@ -81,8 +81,9 @@ cd ${SRCDIR} || exit 1
chmod -R u+w,go+r-w,a-s .
-# zcat ${CWD}/${NAME}.patch.gz | patch -p0 -E --backup --verbose || exit 1
-zcat ${CWD}/${NAME}-0.6.8-dbus.patch.gz | patch -p1 -E --backup --verbose || exit 1
+if [ -r ${CWD}/apply-patches.sh ]; then
+ . ${CWD}/apply-patches.sh || exit 1
+fi
sed -i 's/\r//' docs/*.html
rm -rf examples/dstat.py
@@ -96,10 +97,12 @@ chmod a+x ${PKG}/usr/share/dstat/dstat.py
# Add a documentation directory:
mkdir -p ${DOCDIR}
cp -a \
- AUTHORS ChangeLog COPYING README TODO docs/*.{html,txt} examples/ \
+ AUTHORS COPYING README TODO docs/*.{html,txt} examples/ \
${CWD}/ChangeLog.SB ${DOCDIR}/
+[ -r ChangeLog ] && head -n 1000 ChangeLog > ${DOCDIR}/ChangeLog
find ${DOCDIR}/ -type d -print0 | xargs -0 chmod 0755
find ${DOCDIR}/ -type f -print0 | xargs -0 chmod 0644
+find ${DOCDIR}/ -type f -size 0 -print0 | xargs -0 rm -f
# Compress and link manpages, if any:
if [ -d ${PKG}/usr/share/man ]; then
@@ -131,11 +134,13 @@ sed -i "s|_PACKAGER|${PACKAGER}|g; s|_BUILD_DATE|${DATE}|g" \
if [ "${SB_REP}" = "YES" ] ;then
# Replicate slackbuild and patches
- mkdir -p ${SBDIR}
+ mkdir -p ${SBDIR}/patches
install -m0644 ${CWD}/slack-desc ${CWD}/slack-required ${CWD}/ChangeLog.SB \
- ${CWD}/${NAME}-*.patch.gz ${SBDIR}/
+ ${CWD}/apply-patches.sh ${SBDIR}/
install -m0755 ${CWD}/${NAME}.SlackBuild \
${SBDIR}/${NAME}.SlackBuild
+ install -m0644 ${CWD}/patches/*.* \
+ ${SBDIR}/patches/
fi
# Build package:
0  dstat/dstat-0.6.8-dbus.patch.gz → dstat/patches/dstat-0.6.8-dbus.patch.gz
View
File renamed without changes
106 dstat/patches/dstat-0.7.2-bits.patch
View
@@ -0,0 +1,106 @@
+--- dstat-0.7.2/dstat.orig 2010-06-11 08:08:01.000000000 +0200
++++ dstat-0.7.2/dstat 2010-08-24 09:50:39.000000000 +0200
+@@ -90,6 +90,8 @@ class Options:
+ self.output = False
+ self.pidfile = False
+ self.profile = ''
++ self.netbits = False
++ self.diskbits = False
+
+ ### List of available plugins
+ allplugins = listplugins()
+@@ -111,9 +113,9 @@ class Options:
+ }
+
+ try:
+- opts, args = getopt.getopt(args, 'acdfghilmno:prstTvyC:D:I:M:N:S:V',
+- ['all', 'all-plugins', 'bw', 'blackonwhite', 'debug',
+- 'filesystem', 'float', 'full', 'help', 'integer',
++ opts, args = getopt.getopt(args, 'abcdfghilmno:prstTvyC:D:I:M:N:S:V',
++ ['all', 'all-plugins', 'bw', 'bits', 'blackonwhite', 'debug',
++ 'filesystem', 'float', 'full', 'help', 'integer', 'netbits', 'diskbits'
+ 'list', 'mods', 'modules', 'nocolor', 'noheaders', 'noupdate',
+ 'output=', 'pidfile=', 'profile', 'version', 'vmstat'] + allplugins)
+ except getopt.error, exc:
+@@ -179,6 +181,13 @@ class Options:
+ self.blackonwhite = True
+ elif opt in ['--debug']:
+ self.debug = self.debug + 1
++ elif opt in ['--bits', '-b']:
++ self.netbits = True
++ self.diskbits = True
++ elif opt in ['--netbits']:
++ self.netbits = True
++ elif opt in ['--diskbits']:
++ self.diskbits = True
+ elif opt in ['--float']:
+ self.float = True
+ elif opt in ['--integer']:
+@@ -268,9 +277,11 @@ Dstat options:
+ -C 0,3,total include cpu0, cpu3 and total
+ -d, --disk enable disk stats
+ -D total,hda include hda and total
++ --diskbits output disk stats in bits instead of bytes
+ -g, --page enable page stats
+ -i, --int enable interrupt stats
+ -I 5,eth2 include int5 and interrupt used by eth2
++ --netbits output net stats in bits instead of bytes
+ -l, --load enable load stats
+ -m, --mem enable memory stats
+ -n, --net enable network stats
+@@ -282,6 +293,7 @@ Dstat options:
+ -t, --time enable time/date output
+ -T, --epoch enable time counter (seconds since epoch)
+ -y, --sys enable system stats
++ -b, --bits output disk/net stats in bits instead of bytes
+
+ --aio enable aio stats
+ --fs, --filesystem enable fs stats
+@@ -719,6 +731,12 @@ class dstat_disk(dstat):
+ return ['dsk/'+sysfs_dev(name) for name in self.vars]
+
+ def extract(self):
++
++ # Default to 1.0 (leave as bytes) but if bits convert the bytes to bits
++ factor = 1.0
++ if op.diskbits:
++ factor = 8.0
++
+ for name in self.vars: self.set2[name] = (0, 0)
+ for l in self.splitlines():
+ if len(l) < 13: continue
+@@ -736,8 +754,8 @@ class dstat_disk(dstat):
+ self.set2[diskset] = ( self.set2[diskset][0] + long(l[5]), self.set2[diskset][1] + long(l[9]) )
+ for name in self.set2.keys():
+ self.val[name] = (
+- (self.set2[name][0] - self.set1[name][0]) * 512.0 / elapsed,
+- (self.set2[name][1] - self.set1[name][1]) * 512.0 / elapsed,
++ (self.set2[name][0] - self.set1[name][0]) * factor * 512.0 / elapsed,
++ (self.set2[name][1] - self.set1[name][1]) * factor * 512.0 / elapsed,
+ )
+ if step == op.delay:
+ self.set1.update(self.set2)
+@@ -1227,6 +1245,12 @@ class dstat_net(dstat):
+
+ def extract(self):
+ self.set2['total'] = [0, 0]
++
++ # Default to 1.0 (leave as bytes) but if bits convert the bytes to bits
++ factor = 1.0
++ if op.netbits:
++ factor = 8.0
++
+ for l in self.splitlines(replace=':'):
+ if len(l) < 17: continue
+ if l[2] == '0' and l[10] == '0': continue
+@@ -1238,8 +1262,8 @@ class dstat_net(dstat):
+ if update:
+ for name in self.set2.keys():
+ self.val[name] = [
+- (self.set2[name][0] - self.set1[name][0]) * 1.0 / elapsed,
+- (self.set2[name][1] - self.set1[name][1]) * 1.0 / elapsed,
++ (self.set2[name][0] - self.set1[name][0]) * factor / elapsed,
++ (self.set2[name][1] - self.set1[name][1]) * factor / elapsed,
+ ]
+ if self.val[name][0] < 0: self.val[name][0] += maxint + 1
+ if self.val[name][1] < 0: self.val[name][1] += maxint + 1
4 feh/ChangeLog.SB
View
@@ -1,3 +1,7 @@
+Tue Aug 24 20:39:58 BRT 2010
+feh-1.9-x86_64-1xinc.tgz:
+Updated to 1.9.
++--------------------------+
Sun Jun 27 01:16:45 BRT 2010
feh-1.8-x86_64-1xinc.tgz:
Updated to 1.8.
2  feh/feh.SlackBuild
View
@@ -44,7 +44,7 @@ fi
NAME=feh
PKG=${PKG:-${TMP}/package-${NAME}}
-VERSION=${VERSION:-1.8}
+VERSION=${VERSION:-1.9}
if [ "${SB_NATIVE}" = "YES" ] ;then
ARCH=${ARCH:-$(uname -m)}
else
4 file/ChangeLog.SB
View
@@ -1,3 +1,7 @@
+Wed Aug 25 18:11:38 BRT 2010
+file-5.04-x86_64-5xinc.tgz:
+Rebuilt.
++--------------------------+
Fri Aug 13 19:11:30 BRT 2010
file-5.04-x86_64-4xinc.tgz:
Rebuilt.
1  file/apply-patches.sh
View
@@ -26,6 +26,7 @@ patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/file-5.04-html-regression.patc
patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/file-5.04-zmachine-magic-update.patch
patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/file-5.04-core-prpsinfo.patch
patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/file-5.04-python-2.7.patch
+patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/file-5.04-webm.patch
# Mandriva
zcat ${SB_PATCHDIR}/file-4.24-selinux.patch.gz | patch -p1 -E --backup --verbose
2  file/file.SlackBuild
View
@@ -56,7 +56,7 @@ else
SLKTARGET=${SLKTARGET:-i486}
fi
SLKDTARGET=${SLKDTARGET:-slackware}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
NJOBS=${NJOBS:-$(( $(getconf _NPROCESSORS_ONLN) + 1 ))}
DOCDIR=${PKG}/usr/doc/${NAME}-${VERSION}
DOCDIR2=${PKG}/usr/doc/python-magic-${VERSION}
16 file/patches/file-5.04-webm.patch
View
@@ -0,0 +1,16 @@
+diff --git a/magic/Magdir/matroska b/magic/Magdir/matroska
+index 0ede715..d3d7349 100644
+--- a/magic/Magdir/matroska
++++ b/magic/Magdir/matroska
+@@ -13,3 +13,11 @@
+ # DocType contents:
+ >>8 string matroska Matroska data
+ !:mime video/x-matroska
++
++# EBML id:
++0 belong 0x1a45dfa3
++# DocType id:
++>0 search/4096 \x42\x82
++# DocType contents:
++>>&1 string webm WebM
++!:mime video/webm
4 game-music-emu/ChangeLog.SB
View
@@ -1,3 +1,7 @@
+Wed Aug 25 19:05:21 BRT 2010
+game-music-emu-0.5.5-x86_64-2xinc.tgz:
+Rebuilt.
++--------------------------+
Mon May 10 17:28:56 BRT 2010
game-music-emu-0.5.5-x86_64-1xinc.tgz:
First SB.
2  game-music-emu/apply-patches.sh
View
@@ -3,6 +3,8 @@ set -e -o pipefail
SB_PATCHDIR=${CWD}/patches
+# patch -p0 -E --backup --verbose -i ${SB_PATCHDIR}/${NAME}.patch
patch -p0 -E --backup -z .libsuffix --verbose -i ${SB_PATCHDIR}/${NAME}-0.5.5-libsuffix.patch
+patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/01_symbol-exports.patch
set +e +o pipefail
18 game-music-emu/game-music-emu.SlackBuild
View
@@ -55,7 +55,7 @@ else
SLKTARGET=${SLKTARGET:-i486}
fi
SLKDTARGET=${SLKDTARGET:-slackware}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NJOBS=${NJOBS:-$(( $(getconf _NPROCESSORS_ONLN) + 1 ))}
DOCDIR=${PKG}/usr/doc/${NAME}-${VERSION}
SBDIR=${PKG}/usr/src/slackbuilds/${NAME}
@@ -108,7 +108,6 @@ cd ${SRCDIR} || exit 1
chmod -R u+w,go+r-w,a-s .
-# zcat ${CWD}/${NAME}.patch.gz | patch -p0 -E --backup --verbose || exit 1
if [ -r ${CWD}/apply-patches.sh ]; then
. ${CWD}/apply-patches.sh || exit 1
fi
@@ -144,6 +143,21 @@ mkdir -p build
find ${PKG} | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+mkdir -p ${PKG}/usr/lib${LIBDIRSUFFIX}/pkgconfig
+cat > ${PKG}/usr/lib${LIBDIRSUFFIX}/pkgconfig/libgme.pc <<EOF
+prefix=/usr
+exec_prefix=\${prefix}
+libdir=\${exec_prefix}/lib${LIBDIRSUFFIX}
+includedir=\${prefix}/include
+
+Name: mad
+Description: Video game music file emulation/playback library
+Requires:
+Version: ${VERSION}
+Libs: -L\${libdir} -lgme
+Cflags: -I\${includedir}
+EOF
+
# Add a documentation directory:
mkdir -p ${DOCDIR}
cp -a \
491 game-music-emu/patches/01_symbol-exports.patch
View
@@ -0,0 +1,491 @@
+diff -Naur game-music-emu-0.5.5.old/CMakeLists.txt game-music-emu-0.5.5/CMakeLists.txt
+--- game-music-emu-0.5.5.old/CMakeLists.txt 2009-07-13 06:53:08.000000000 +0200
++++ game-music-emu-0.5.5/CMakeLists.txt 2010-03-22 14:25:40.427519453 +0100
+@@ -1,6 +1,10 @@
+ # CMake project definition file.
+ project(libgme)
+
++include (CheckCXXCompilerFlag)
++
++set(GME_VERSION 0.5.5 CACHE INTERNAL "libgme Version")
++
+ # 2.6+ always assumes FATAL_ERROR, but 2.4 and below don't.
+ # Of course, 2.4 might work, in which case you're welcome to drop
+ # down the requirement, but I can't test that.
+@@ -52,6 +56,33 @@
+ SET(USE_GME_NSF 1 CACHE BOOL "Enable NES NSF music emulation" FORCE)
+ endif()
+
++# Check for GCC "visibility" support.
++if (CMAKE_COMPILER_IS_GNUCXX)
++ check_cxx_compiler_flag (-fvisibility=hidden __LIBGME_TEST_VISIBILITY)
++ set (ENABLE_VISIBILITY OFF)
++ if (__LIBGME_TEST_VISIBILITY)
++ # get the gcc version
++ exec_program(${CMAKE_CXX_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info)
++ string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
++
++ # gcc <4.1 had poor support for symbol visibility
++ if ((${_gcc_version} VERSION_GREATER "4.1") OR (${_gcc_version} VERSION_EQUAL "4.1"))
++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
++ set (ENABLE_VISIBILITY ON)
++ add_definitions (-DLIBGME_VISIBILITY)
++
++ # GCC >= 4.2 also correctly supports making inline members have hidden
++ # visibility by default.
++ if ((${_gcc_version} VERSION_GREATER "4.2") OR (${_gcc_version} VERSION_EQUAL "4.2"))
++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
++ endif()
++ endif()
++ endif() # test visibility
++endif (CMAKE_COMPILER_IS_GNUCXX)
++
++# Cache this result
++set( LIBGME_HAVE_GCC_VISIBILITY ${ENABLE_VISIBILITY} CACHE BOOL "GCC support for hidden visibility")
++
+ # Shared library defined here
+ add_subdirectory(gme)
+
+diff -Naur game-music-emu-0.5.5.old/gme/blargg_source.h game-music-emu-0.5.5/gme/blargg_source.h
+--- game-music-emu-0.5.5.old/gme/blargg_source.h 2009-06-24 04:21:29.000000000 +0200
++++ game-music-emu-0.5.5/gme/blargg_source.h 2010-03-22 14:24:56.280934821 +0100
+@@ -66,6 +66,17 @@
+ #define byte byte_
+ typedef unsigned char byte;
+
++// Setup compiler defines useful for exporting required public API symbols in gme.cpp
++#ifndef BLARGG_EXPORT
++ #if defined (_WIN32) && defined(BLARGG_BUILD_DLL)
++ #define BLARGG_EXPORT __declspec(dllexport)
++ #elif defined (LIBGME_VISIBILITY)
++ #define BLARGG_EXPORT __attribute__((visibility ("default")))
++ #else
++ #define BLARGG_EXPORT
++ #endif
++#endif
++
+ // deprecated
+ #define BLARGG_CHECK_ALLOC CHECK_ALLOC
+ #define BLARGG_RETURN_ERR RETURN_ERR
+diff -Naur game-music-emu-0.5.5.old/gme/CMakeLists.txt game-music-emu-0.5.5/gme/CMakeLists.txt
+--- game-music-emu-0.5.5.old/gme/CMakeLists.txt 2009-07-13 06:53:08.000000000 +0200
++++ game-music-emu-0.5.5/gme/CMakeLists.txt 2010-03-22 14:24:56.276931030 +0100
+@@ -144,6 +144,11 @@
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/gme_types.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/gme_types.h)
+
++# On some platforms we may need to change headers or whatnot based on whether
++# we're building the library or merely using the library. The following is
++# only defined when building the library to allow us to tell which is which.
++add_definitions(-DBLARGG_BUILD_DLL)
++
+ # For the gme_types.h
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+diff -Naur game-music-emu-0.5.5.old/gme/gme.cpp game-music-emu-0.5.5/gme/gme.cpp
+--- game-music-emu-0.5.5.old/gme/gme.cpp 2009-07-27 06:14:46.000000000 +0200
++++ game-music-emu-0.5.5/gme/gme.cpp 2010-03-22 14:27:34.676925694 +0100
+@@ -22,7 +22,7 @@
+
+ #include "blargg_source.h"
+
+-gme_type_t const* gme_type_list()
++BLARGG_EXPORT gme_type_t const* gme_type_list()
+ {
+ static gme_type_t const gme_type_list_ [] = {
+ #ifdef USE_GME_AY
+@@ -61,7 +61,7 @@
+ return gme_type_list_;
+ }
+
+-const char* gme_identify_header( void const* header )
++BLARGG_EXPORT const char* gme_identify_header( void const* header )
+ {
+ switch ( get_be32( header ) )
+ {
+@@ -90,7 +90,7 @@
+ *out = 0; // extension too long
+ }
+
+-gme_type_t gme_identify_extension( const char* extension_ )
++BLARGG_EXPORT gme_type_t gme_identify_extension( const char* extension_ )
+ {
+ char const* end = strrchr( extension_, '.' );
+ if ( end )
+@@ -105,7 +105,7 @@
+ return 0;
+ }
+
+-gme_err_t gme_identify_file( const char* path, gme_type_t* type_out )
++BLARGG_EXPORT gme_err_t gme_identify_file( const char* path, gme_type_t* type_out )
+ {
+ *type_out = gme_identify_extension( path );
+ // TODO: don't examine header if file has extension?
+@@ -120,7 +120,7 @@
+ return 0;
+ }
+
+-gme_err_t gme_open_data( void const* data, long size, Music_Emu** out, int sample_rate )
++BLARGG_EXPORT gme_err_t gme_open_data( void const* data, long size, Music_Emu** out, int sample_rate )
+ {
+ require( (data || !size) && out );
+ *out = 0;
+@@ -144,7 +144,7 @@
+ return err;
+ }
+
+-gme_err_t gme_open_file( const char* path, Music_Emu** out, int sample_rate )
++BLARGG_EXPORT gme_err_t gme_open_file( const char* path, Music_Emu** out, int sample_rate )
+ {
+ require( path && out );
+ *out = 0;
+@@ -181,7 +181,7 @@
+ return err;
+ }
+
+-Music_Emu* gme_new_emu( gme_type_t type, int rate )
++BLARGG_EXPORT Music_Emu* gme_new_emu( gme_type_t type, int rate )
+ {
+ if ( type )
+ {
+@@ -214,27 +214,27 @@
+ return 0;
+ }
+
+-gme_err_t gme_load_file( Music_Emu* me, const char* path ) { return me->load_file( path ); }
++BLARGG_EXPORT gme_err_t gme_load_file( Music_Emu* me, const char* path ) { return me->load_file( path ); }
+
+-gme_err_t gme_load_data( Music_Emu* me, void const* data, long size )
++BLARGG_EXPORT gme_err_t gme_load_data( Music_Emu* me, void const* data, long size )
+ {
+ Mem_File_Reader in( data, size );
+ return me->load( in );
+ }
+
+-gme_err_t gme_load_custom( Music_Emu* me, gme_reader_t func, long size, void* data )
++BLARGG_EXPORT gme_err_t gme_load_custom( Music_Emu* me, gme_reader_t func, long size, void* data )
+ {
+ Callback_Reader in( func, size, data );
+ return me->load( in );
+ }
+
+-void gme_delete( Music_Emu* me ) { delete me; }
++BLARGG_EXPORT void gme_delete( Music_Emu* me ) { delete me; }
+
+-gme_type_t gme_type( Music_Emu const* me ) { return me->type(); }
++BLARGG_EXPORT gme_type_t gme_type( Music_Emu const* me ) { return me->type(); }
+
+-const char* gme_warning( Music_Emu* me ) { return me->warning(); }
++BLARGG_EXPORT const char* gme_warning( Music_Emu* me ) { return me->warning(); }
+
+-int gme_track_count( Music_Emu const* me ) { return me->track_count(); }
++BLARGG_EXPORT int gme_track_count( Music_Emu const* me ) { return me->track_count(); }
+
+ struct gme_info_t_ : gme_info_t
+ {
+@@ -243,7 +243,7 @@
+ BLARGG_DISABLE_NOTHROW
+ };
+
+-gme_err_t gme_track_info( Music_Emu const* me, gme_info_t** out, int track )
++BLARGG_EXPORT gme_err_t gme_track_info( Music_Emu const* me, gme_info_t** out, int track )
+ {
+ *out = NULL;
+
+@@ -309,12 +309,12 @@
+ return 0;
+ }
+
+-void gme_free_info( gme_info_t* info )
++BLARGG_EXPORT void gme_free_info( gme_info_t* info )
+ {
+ delete STATIC_CAST(gme_info_t_*,info);
+ }
+
+-void gme_set_stereo_depth( Music_Emu* me, double depth )
++BLARGG_EXPORT void gme_set_stereo_depth( Music_Emu* me, double depth )
+ {
+ #if !GME_DISABLE_STEREO_DEPTH
+ if ( me->effects_buffer )
+@@ -322,23 +322,23 @@
+ #endif
+ }
+
+-void* gme_user_data ( Music_Emu const* me ) { return me->user_data(); }
+-void gme_set_user_data ( Music_Emu* me, void* new_user_data ) { me->set_user_data( new_user_data ); }
+-void gme_set_user_cleanup(Music_Emu* me, gme_user_cleanup_t func ) { me->set_user_cleanup( func ); }
+-
+-gme_err_t gme_start_track ( Music_Emu* me, int index ) { return me->start_track( index ); }
+-gme_err_t gme_play ( Music_Emu* me, int n, short* p ) { return me->play( n, p ); }
+-void gme_set_fade ( Music_Emu* me, int start_msec ) { me->set_fade( start_msec ); }
+-int gme_track_ended ( Music_Emu const* me ) { return me->track_ended(); }
+-int gme_tell ( Music_Emu const* me ) { return me->tell(); }
+-gme_err_t gme_seek ( Music_Emu* me, int msec ) { return me->seek( msec ); }
+-int gme_voice_count ( Music_Emu const* me ) { return me->voice_count(); }
+-void gme_ignore_silence ( Music_Emu* me, int disable ) { me->ignore_silence( disable != 0 ); }
+-void gme_set_tempo ( Music_Emu* me, double t ) { me->set_tempo( t ); }
+-void gme_mute_voice ( Music_Emu* me, int index, int mute ) { me->mute_voice( index, mute != 0 ); }
+-void gme_mute_voices ( Music_Emu* me, int mask ) { me->mute_voices( mask ); }
++BLARGG_EXPORT void* gme_user_data ( Music_Emu const* me ) { return me->user_data(); }
++BLARGG_EXPORT void gme_set_user_data ( Music_Emu* me, void* new_user_data ) { me->set_user_data( new_user_data ); }
++BLARGG_EXPORT void gme_set_user_cleanup(Music_Emu* me, gme_user_cleanup_t func ) { me->set_user_cleanup( func ); }
++
++BLARGG_EXPORT gme_err_t gme_start_track ( Music_Emu* me, int index ) { return me->start_track( index ); }
++BLARGG_EXPORT gme_err_t gme_play ( Music_Emu* me, int n, short* p ) { return me->play( n, p ); }
++BLARGG_EXPORT void gme_set_fade ( Music_Emu* me, int start_msec ) { me->set_fade( start_msec ); }
++BLARGG_EXPORT int gme_track_ended ( Music_Emu const* me ) { return me->track_ended(); }
++BLARGG_EXPORT int gme_tell ( Music_Emu const* me ) { return me->tell(); }
++BLARGG_EXPORT gme_err_t gme_seek ( Music_Emu* me, int msec ) { return me->seek( msec ); }
++BLARGG_EXPORT int gme_voice_count ( Music_Emu const* me ) { return me->voice_count(); }
++BLARGG_EXPORT void gme_ignore_silence ( Music_Emu* me, int disable ) { me->ignore_silence( disable != 0 ); }
++BLARGG_EXPORT void gme_set_tempo ( Music_Emu* me, double t ) { me->set_tempo( t ); }
++BLARGG_EXPORT void gme_mute_voice ( Music_Emu* me, int index, int mute ) { me->mute_voice( index, mute != 0 ); }
++BLARGG_EXPORT void gme_mute_voices ( Music_Emu* me, int mask ) { me->mute_voices( mask ); }
+
+-void gme_set_equalizer ( Music_Emu* me, gme_equalizer_t const* eq )
++BLARGG_EXPORT void gme_set_equalizer ( Music_Emu* me, gme_equalizer_t const* eq )
+ {
+ Music_Emu::equalizer_t e = me->equalizer();
+ e.treble = eq->treble;
+@@ -346,7 +346,7 @@
+ me->set_equalizer( e );
+ }
+
+-void gme_equalizer( Music_Emu const* me, gme_equalizer_t* out )
++BLARGG_EXPORT void gme_equalizer( Music_Emu const* me, gme_equalizer_t* out )
+ {
+ gme_equalizer_t e = { };
+ e.treble = me->equalizer().treble;
+@@ -354,13 +354,13 @@
+ *out = e;
+ }
+
+-const char* gme_voice_name( Music_Emu const* me, int i )
++BLARGG_EXPORT const char* gme_voice_name( Music_Emu const* me, int i )
+ {
+ assert( (unsigned) i < (unsigned) me->voice_count() );
+ return me->voice_names() [i];
+ }
+
+-const char* gme_type_system( gme_type_t type )
++BLARGG_EXPORT const char* gme_type_system( gme_type_t type )
+ {
+ assert( type );
+ return type->system;
+diff -Naur game-music-emu-0.5.5.old/gme/M3u_Playlist.cpp game-music-emu-0.5.5/gme/M3u_Playlist.cpp
+--- game-music-emu-0.5.5.old/gme/M3u_Playlist.cpp 2009-07-27 06:14:46.000000000 +0200
++++ game-music-emu-0.5.5/gme/M3u_Playlist.cpp 2010-03-22 14:24:56.276931030 +0100
+@@ -52,9 +52,9 @@
+
+ blargg_err_t Gme_File::load_m3u( Data_Reader& in ) { return load_m3u_( playlist.load( in ) ); }
+
+-gme_err_t gme_load_m3u( Music_Emu* me, const char* path ) { return me->load_m3u( path ); }
++BLARGG_EXPORT gme_err_t gme_load_m3u( Music_Emu* me, const char* path ) { return me->load_m3u( path ); }
+
+-gme_err_t gme_load_m3u_data( Music_Emu* me, const void* data, long size )
++BLARGG_EXPORT gme_err_t gme_load_m3u_data( Music_Emu* me, const void* data, long size )
+ {
+ Mem_File_Reader in( data, size );
+ return me->load_m3u( in );
+diff -Naur game-music-emu-0.5.5.old/player/Music_Player.cpp game-music-emu-0.5.5/player/Music_Player.cpp
+--- game-music-emu-0.5.5.old/player/Music_Player.cpp 2009-07-27 06:14:46.000000000 +0200
++++ game-music-emu-0.5.5/player/Music_Player.cpp 2010-03-22 14:24:56.280934821 +0100
+@@ -2,12 +2,10 @@
+
+ #include "Music_Player.h"
+
+-#include "gme/Music_Emu.h"
+-
+ #include <string.h>
+ #include <ctype.h>
+
+-/* Copyright (C) 2005-2006 by Shay Green. Permission is hereby granted, free of
++/* Copyright (C) 2005-2010 by Shay Green. Permission is hereby granted, free of
+ charge, to any person obtaining a copy of this software module and associated
+ documentation files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use, copy, modify,
+@@ -22,7 +20,12 @@
+ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
+
+-#include "blargg_source.h"
++#define RETURN_ERR( expr ) \
++ do {\
++ gme_err_t err_ = (expr);\
++ if ( err_ )\
++ return err_;\
++ } while ( 0 )
+
+ // Number of audio buffers per second. Adjust if you encounter audio skipping.
+ const int fill_rate = 45;
+@@ -36,12 +39,13 @@
+
+ Music_Player::Music_Player()
+ {
+- emu_ = 0;
+- scope_buf = 0;
+- paused = false;
++ emu_ = 0;
++ scope_buf = 0;
++ paused = false;
++ track_info_ = NULL;
+ }
+
+-blargg_err_t Music_Player::init( long rate )
++gme_err_t Music_Player::init( long rate )
+ {
+ sample_rate = rate;
+
+@@ -56,17 +60,18 @@
+ void Music_Player::stop()
+ {
+ sound_stop();
+- delete emu_;
+- emu_ = 0;
++ gme_delete( emu_ );
++ emu_ = NULL;
+ }
+
+ Music_Player::~Music_Player()
+ {
+ stop();
+ sound_cleanup();
++ gme_free_info( track_info_ );
+ }
+
+-blargg_err_t Music_Player::load_file( const char* path )
++gme_err_t Music_Player::load_file( const char* path )
+ {
+ stop();
+
+@@ -79,34 +84,36 @@
+ if ( !p )
+ p = m3u_path + strlen( m3u_path );
+ strcpy( p, ".m3u" );
+- if ( emu_->load_m3u( m3u_path ) ) { } // ignore error
++ if ( gme_load_m3u( emu_, m3u_path ) ) { } // ignore error
+
+ return 0;
+ }
+
+ int Music_Player::track_count() const
+ {
+- return emu_ ? emu_->track_count() : false;
++ return emu_ ? gme_track_count( emu_ ) : false;
+ }
+
+-blargg_err_t Music_Player::start_track( int track )
++gme_err_t Music_Player::start_track( int track )
+ {
+ if ( emu_ )
+ {
++ gme_free_info( track_info_ );
++ track_info_ = NULL;
++ RETURN_ERR( gme_track_info( emu_, &track_info_, track ) );
++
+ // Sound must not be running when operating on emulator
+ sound_stop();
+- RETURN_ERR( emu_->start_track( track ) );
++ RETURN_ERR( gme_start_track( emu_, track ) );
+
+ // Calculate track length
+- if ( !emu_->track_info( &track_info_ ) )
+- {
+- if ( track_info_.length <= 0 )
+- track_info_.length = track_info_.intro_length +
+- track_info_.loop_length * 2;
+- }
+- if ( track_info_.length <= 0 )
+- track_info_.length = (long) (2.5 * 60 * 1000);
+- emu_->set_fade( track_info_.length );
++ if ( track_info_->length <= 0 )
++ track_info_->length = track_info_->intro_length +
++ track_info_->loop_length * 2;
++
++ if ( track_info_->length <= 0 )
++ track_info_->length = (long) (2.5 * 60 * 1000);
++ gme_set_fade( emu_, track_info_->length );
+
+ paused = false;
+ sound_start();
+@@ -137,7 +144,7 @@
+
+ bool Music_Player::track_ended() const
+ {
+- return emu_ ? emu_->track_ended() : false;
++ return emu_ ? gme_track_ended( emu_ ) : false;
+ }
+
+ void Music_Player::set_stereo_depth( double tempo )
+@@ -150,15 +157,15 @@
+ void Music_Player::set_tempo( double tempo )
+ {
+ suspend();
+- emu_->set_tempo( tempo );
++ gme_set_tempo( emu_, tempo );
+ resume();
+ }
+
+ void Music_Player::mute_voices( int mask )
+ {
+ suspend();
+- emu_->mute_voices( mask );
+- emu_->ignore_silence( mask != 0 );
++ gme_mute_voices( emu_, mask );
++ gme_ignore_silence( emu_, mask != 0 );
+ resume();
+ }
+
+@@ -167,7 +174,7 @@
+ Music_Player* self = (Music_Player*) data;
+ if ( self->emu_ )
+ {
+- if ( self->emu_->play( count, out ) ) { } // ignore error
++ if ( gme_play( self->emu_, count, out ) ) { } // ignore error
+
+ if ( self->scope_buf )
+ memcpy( self->scope_buf, out, self->scope_buf_size * sizeof *self->scope_buf );
+diff -Naur game-music-emu-0.5.5.old/player/Music_Player.h game-music-emu-0.5.5/player/Music_Player.h
+--- game-music-emu-0.5.5.old/player/Music_Player.h 2009-07-27 06:14:46.000000000 +0200
++++ game-music-emu-0.5.5/player/Music_Player.h 2010-03-22 14:24:56.280934821 +0100
+@@ -4,18 +4,18 @@
+ #ifndef MUSIC_PLAYER_H
+ #define MUSIC_PLAYER_H
+
+-#include "gme/Music_Emu.h"
++#include "gme.h"
+
+ class Music_Player {
+ public:
+ // Initialize player and set sample rate
+- blargg_err_t init( long sample_rate = 44100 );
++ gme_err_t init( long sample_rate = 44100 );
+
+ // Load game music file. NULL on success, otherwise error string.
+- blargg_err_t load_file( const char* path );
++ gme_err_t load_file( const char* path );
+
+ // (Re)start playing track. Tracks are numbered from 0 to track_count() - 1.
+- blargg_err_t start_track( int track );
++ gme_err_t start_track( int track );
+
+ // Stop playing current file
+ void stop();
+@@ -26,7 +26,7 @@
+ int track_count() const;
+
+ // Info for current track
+- track_info_t const& track_info() const { return track_info_; }
++ gme_info_t const& track_info() const { return *track_info_; }
+
+ // Pause/resume playing current track.
+ void pause( int );
+@@ -59,7 +59,7 @@
+ long sample_rate;
+ int scope_buf_size;
+ bool paused;
+- track_info_t track_info_;
++ gme_info_t* track_info_;
+
+ void suspend();
+ void resume();
4 gnome/empathy/ChangeLog.SB
View
@@ -1,3 +1,7 @@
+Tue Aug 24 12:47:41 BRT 2010
+empathy-2.30.3-x86_64-1xinc.tgz:
+Updated to 2.30.3.
++--------------------------+
Sun Jun 27 01:35:34 BRT 2010
empathy-2.30.2-x86_64-2xinc.tgz:
Rebuilt.
11 gnome/empathy/empathy.SlackBuild
View
@@ -43,7 +43,7 @@ fi
NAME=empathy
PKG=${PKG:-${TMP}/package-${NAME}}
-VERSION=${VERSION:-2.30.2}
+VERSION=${VERSION:-2.30.3}
SVER=$(echo ${VERSION} | cut -d . -f1-2)
if [ "${SB_NATIVE}" = "YES" ] ;then
ARCH=${ARCH:-$(uname -m)}
@@ -56,7 +56,7 @@ else
SLKTARGET=${SLKTARGET:-i486}
fi
SLKDTARGET=${SLKDTARGET:-slackware}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
NJOBS=${NJOBS:-$(( $(getconf _NPROCESSORS_ONLN) + 1 ))}
DOCDIR=${PKG}/usr/doc/${NAME}-${VERSION}
SBDIR=${PKG}/usr/src/slackbuilds/gnome/${NAME}
@@ -68,15 +68,18 @@ DATE=$(LC_ALL=C date +%d-%b-%Y)
SRCDIR=${NAME}-${VERSION}
SRCARCHIVE=${SRCDIR}.tar.bz2
+SSRCARCHIVE=${SRCDIR}.sha256sum
DL_PROG=${DL_PROG:-wget}
DL_TO=${DL_TO:-5}
DL_OPTS=${DL_OPTS:-"--timeout=${DL_TO}"}
GNOME_MIRROR=${GNOME_MIRROR:-http://ftp.gnome.org/pub/GNOME/sources}
-DL_URL="${GNOME_MIRROR}/${NAME}/${SVER}/${SRCARCHIVE}"
+DL_URL="${GNOME_MIRROR}/${NAME}/${SVER}"
# if source is not present, download in source rootdir if possible
-test -r ${CWD}/${SRCARCHIVE} || ${DL_PROG} ${DL_OPTS} ${DL_URL} || exit 1
+for file in ${SRCARCHIVE} ${SSRCARCHIVE} ;do
+ test -r ${CWD}/${file} || ${DL_PROG} ${DL_OPTS} ${DL_URL}/${file} || exit 1
+done
if [ "${SB_NATIVE}" = "YES" ] ;then
SLKCFLAGS="-O2 -march=native -mtune=native ${SB_ECFLAGS} -pipe"
4 gnome/system-config-printer/ChangeLog.SB
View
@@ -1,3 +1,7 @@
+Wed Aug 25 01:58:57 BRT 2010
+system-config-printer-1.2.4-x86_64-1xinc.tgz:
+Updated to 1.2.4.
++--------------------------+
Thu Jul 29 17:53:18 BRT 2010
system-config-printer-1.2.3-x86_64-1xinc.tgz:
Updated to 1.2.3.
2  gnome/system-config-printer/system-config-printer.SlackBuild
View
@@ -43,7 +43,7 @@ fi
NAME=system-config-printer
PKG=${PKG:-${TMP}/package-${NAME}}
-VERSION=${VERSION:-1.2.3}
+VERSION=${VERSION:-1.2.4}
SVER=$(echo ${VERSION} | cut -d . -f1-2)
if [ "${SB_NATIVE}" = "YES" ] ;then
ARCH=${ARCH:-$(uname -m)}
4 highlight/ChangeLog.SB
View
@@ -1,3 +1,7 @@
+Wed Aug 25 12:10:19 BRT 2010
+highlight-3.1-x86_64-1xinc.tgz:
+Updated to 3.1.
++--------------------------+
Fri Aug 13 21:11:58 BRT 2010
highlight-3.1.beta3-x86_64-1xinc.tgz:
Updated to 3.1-beta3.
2  highlight/highlight.SlackBuild
View
@@ -43,7 +43,7 @@ fi
NAME=highlight
PKG=${PKG:-${TMP}/package-${NAME}}
-VERSION=${VERSION:-3.1-beta3}
+VERSION=${VERSION:-3.1}
if [ "${SB_NATIVE}" = "YES" ] ;then
ARCH=${ARCH:-$(uname -m)}
else
4 inkscape/ChangeLog.SB
View
@@ -1,3 +1,7 @@
+Thu Aug 26 01:44:51 BRT 2010
+inkscape-0.48.0-x86_64-1xinc.tgz:
+Updated to 0.48.0.
++--------------------------+
Wed Jun 9 03:30:12 BRT 2010
inkscape-0.47-x86_64-2phantomx.tgz:
gcc 4.5 patch.
7 inkscape/apply-patches.sh
View
@@ -4,13 +4,8 @@ set -e -o pipefail
SB_PATCHDIR=${CWD}/patches
# patch -p0 -E --backup --verbose -i ${SB_PATCHDIR}/${NAME}.patch
-zcat ${SB_PATCHDIR}/${NAME}-20090410svn-uniconv.patch.gz | patch -p1 -E --backup --verbose
zcat ${SB_PATCHDIR}/${NAME}-20090410svn-formats.patch.gz | patch -p1 -E --backup --verbose
-zcat ${SB_PATCHDIR}/${NAME}-20090925svn-el5.patch.gz | patch -p1 -E --backup --verbose
zcat ${SB_PATCHDIR}/${NAME}-20091101svn-icon.patch.gz | patch -p0 -E --backup --verbose
-# https://bugs.launchpad.net/inkscape/+bug/487038
-zcat ${SB_PATCHDIR}/${NAME}-0.47-poppler-0.12.2.patch.gz | patch -p1 -E --backup --verbose
-# https://bugs.launchpad.net/inkscape/+bug/522327
-patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/${NAME}-0.47-gcc45.patch
+patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/${NAME}-0.48-newpoppler.patch
set +e +o pipefail
4 inkscape/inkscape.SlackBuild
View
@@ -43,7 +43,7 @@ fi
NAME=inkscape
PKG=${PKG:-${TMP}/package-${NAME}}
-VERSION=${VERSION:-0.47}
+VERSION=${VERSION:-0.48.0}
if [ "${SB_NATIVE}" = "YES" ] ;then
ARCH=${ARCH:-$(uname -m)}
else
@@ -55,7 +55,7 @@ else
SLKTARGET=${SLKTARGET:-i486}
fi
SLKDTARGET=${SLKDTARGET:-slackware}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
NJOBS=${NJOBS:-$(( $(getconf _NPROCESSORS_ONLN) + 1 ))}
DOCDIR=${PKG}/usr/doc/${NAME}-${VERSION}
SBDIR=${PKG}/usr/src/slackbuilds/${NAME}
81 inkscape/patches/inkscape-0.47-gcc45.patch
View
@@ -1,81 +0,0 @@
-diff -Naur inkscape-0.47-orig/src/eraser-context.cpp inkscape-0.47/src/eraser-context.cpp
---- inkscape-0.47-orig/src/eraser-context.cpp 2010-02-18 08:45:58.000000000 -0500
-+++ inkscape-0.47/src/eraser-context.cpp 2010-02-18 08:46:26.000000000 -0500
-@@ -749,7 +749,7 @@
- if ( eraserMode ) {
- toWorkOn = sp_document_partial_items_in_box(sp_desktop_document(desktop), desktop->dkey, bounds);
- } else {
-- Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
-+ Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
- toWorkOn = sp_document_items_at_points(sp_desktop_document(desktop), desktop->dkey, r->getPoints());
- }
- toWorkOn = g_slist_remove( toWorkOn, acid );
-diff -Naur inkscape-0.47-orig/src/extension/internal/filter/filter-file.cpp inkscape-0.47/src/extension/internal/filter/filter-file.cpp
---- inkscape-0.47-orig/src/extension/internal/filter/filter-file.cpp 2010-02-18 08:45:58.000000000 -0500
-+++ inkscape-0.47/src/extension/internal/filter/filter-file.cpp 2010-02-18 09:07:54.000000000 -0500
-@@ -161,7 +161,7 @@
- mywriter writer;
- sp_repr_write_stream(node, writer, 0, FALSE, g_quark_from_static_string("svg"), 0, 0);
-
-- Inkscape::Extension::build_from_mem(xml_str, new Filter::Filter(g_strdup(writer.c_str())));
-+ Inkscape::Extension::build_from_mem(xml_str, new Filter(g_strdup(writer.c_str())));
- g_free(xml_str);
- return;
- }
-diff -Naur inkscape-0.47-orig/src/extension/internal/filter/filter.cpp inkscape-0.47/src/extension/internal/filter/filter.cpp
---- inkscape-0.47-orig/src/extension/internal/filter/filter.cpp 2010-02-18 08:45:58.000000000 -0500
-+++ inkscape-0.47/src/extension/internal/filter/filter.cpp 2010-02-18 09:21:06.000000000 -0500
-@@ -217,7 +217,7 @@
- "<menu-tip>%s</menu-tip>\n"
- "</effect>\n"
- "</inkscape-extension>\n", name, id, submenu, tip);
-- Inkscape::Extension::build_from_mem(xml_str, new Filter::Filter(filter));
-+ Inkscape::Extension::build_from_mem(xml_str, new Filter(filter));
- g_free(xml_str);
- return;
- }
-diff -Naur inkscape-0.47-orig/src/flood-context.cpp inkscape-0.47/src/flood-context.cpp
---- inkscape-0.47-orig/src/flood-context.cpp 2010-02-18 08:45:58.000000000 -0500
-+++ inkscape-0.47/src/flood-context.cpp 2010-02-18 08:48:16.000000000 -0500
-@@ -900,7 +900,7 @@
- if (is_point_fill) {
- fill_points.push_back(Geom::Point(event->button.x, event->button.y));
- } else {
-- Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
-+ Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
- fill_points = r->getPoints();
- }
-
-@@ -1206,7 +1206,7 @@
-
- case GDK_BUTTON_RELEASE:
- if (event->button.button == 1 && !event_context->space_panning) {
-- Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
-+ Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
- if (r->is_started()) {
- // set "busy" cursor
- desktop->setWaitingCursor();
-diff -Naur inkscape-0.47-orig/src/gradient-context.cpp inkscape-0.47/src/gradient-context.cpp
---- inkscape-0.47-orig/src/gradient-context.cpp 2010-02-18 08:45:58.000000000 -0500
-+++ inkscape-0.47/src/gradient-context.cpp 2010-02-18 08:47:33.000000000 -0500
-@@ -641,7 +641,7 @@
- if (!event_context->within_tolerance) {
- // we've been dragging, either do nothing (grdrag handles that),
- // or rubberband-select if we have rubberband
-- Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
-+ Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
- if (r->is_started() && !event_context->within_tolerance) {
- // this was a rubberband drag
- if (r->getMode() == RUBBERBAND_MODE_RECT) {
-diff -Naur inkscape-0.47-orig/src/select-context.cpp inkscape-0.47/src/select-context.cpp
---- inkscape-0.47-orig/src/select-context.cpp 2010-02-18 08:45:58.000000000 -0500
-+++ inkscape-0.47/src/select-context.cpp 2010-02-18 08:50:11.000000000 -0500
-@@ -602,7 +602,7 @@
- }
- sc->item = NULL;
- } else {
-- Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
-+ Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
- if (r->is_started() && !within_tolerance) {
- // this was a rubberband drag
- GSList *items = NULL;
BIN  inkscape/patches/inkscape-0.47-poppler-0.12.2.patch.gz
View
Binary file not shown
72 inkscape/patches/inkscape-0.48-newpoppler.patch
View
@@ -0,0 +1,72 @@
+From d04983e353a3d3ca2d8cb14ca706eaccdcaff704 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Wed, 5 May 2010 08:48:37 +0200
+Subject: [PATCH] Fix build with more recent poppler
+
+---
+ src/extension/internal/pdfinput/pdf-parser.cpp | 19 +++++++++++++------
+ 1 files changed, 13 insertions(+), 6 deletions(-)
+
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index b37cbb7..006e614 100644
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -56,6 +56,13 @@ extern "C" {
+ #define M_PI 3.14159265358979323846
+ #endif
+
++#include <glib/poppler-features.h>
++#if POPPLER_CHECK_VERSION(0,12,2)
++#define PGFX ,NULL
++#else
++#define PGFX
++#endif
++
+ //------------------------------------------------------------------------
+ // constants
+ //------------------------------------------------------------------------
+@@ -1020,9 +1027,9 @@ void PdfParser::opSetFillColorSpace(Object args[], int numArgs) {
+ }
+ #else
+ if (obj.isNull()) {
+- colorSpace = GfxColorSpace::parse(&args[0]);
++ colorSpace = GfxColorSpace::parse(&args[0] PGFX);
+ } else {
+- colorSpace = GfxColorSpace::parse(&obj);
++ colorSpace = GfxColorSpace::parse(&obj PGFX);
+ }
+ #endif
+ obj.free();
+@@ -1051,9 +1058,9 @@ void PdfParser::opSetStrokeColorSpace(Object args[], int numArgs) {
+ }
+ #else
+ if (obj.isNull()) {
+- colorSpace = GfxColorSpace::parse(&args[0]);
++ colorSpace = GfxColorSpace::parse(&args[0] PGFX);
+ } else {
+- colorSpace = GfxColorSpace::parse(&obj);
++ colorSpace = GfxColorSpace::parse(&obj PGFX);
+ }
+ #endif
+ obj.free();
+@@ -1128,7 +1135,7 @@ void PdfParser::opSetFillColorN(Object args[], int numArgs) {
+ }
+ #else
+ if (args[numArgs-1].isName() &&
+- (pattern = res->lookupPattern(args[numArgs-1].getName()))) {
++ (pattern = res->lookupPattern(args[numArgs-1].getName() PGFX))) {
+ state->setFillPattern(pattern);
+ builder->updateStyle(state);
+ }
+@@ -1180,7 +1187,7 @@ void PdfParser::opSetStrokeColorN(Object args[], int numArgs) {
+ }
+ #else
+ if (args[numArgs-1].isName() &&
+- (pattern = res->lookupPattern(args[numArgs-1].getName()))) {
++ (pattern = res->lookupPattern(args[numArgs-1].getName() PGFX))) {
+ state->setStrokePattern(pattern);
+ builder->updateStyle(state);
+ }
+--
+1.7.0.1
+
BIN  inkscape/patches/inkscape-20090410svn-uniconv.patch.gz
View
Binary file not shown
BIN  inkscape/patches/inkscape-20090925svn-el5.patch.gz
View
Binary file not shown
4 john/ChangeLog.SB
View
@@ -1,3 +1,7 @@
+Tue Aug 24 18:05:27 BRT 2010
+john-1.7.6-x86_64-1xinc.tgz:
+Updated to 1.7.6.
++--------------------------+
Sun Jan 3 23:32:52 BRST 2010
john-1.7.4-x86_64-1xinc.tgz:
Updated to 1.7.4.
2  john/john.SlackBuild
View
@@ -43,7 +43,7 @@ fi
NAME=john
PKG=${PKG:-${TMP}/package-${NAME}}
-VERSION=${VERSION:-1.7.4}
+VERSION=${VERSION:-1.7.6}
if [ "${SB_NATIVE}" = "YES" ] ;then
ARCH=${ARCH:-$(uname -m)}
else
4 kde-apps/kde-servicemenu-pdf/ChangeLog.SB
View
@@ -1,3 +1,7 @@
+Tue Aug 24 20:42:25 BRT 2010
+kde-servicemenu-pdf-0.4-noarch-1xinc.tgz:
+Updated to 0.4.
++--------------------------+
Fri Feb 12 00:31:33 BRST 2010
kde-servicemenu-pdf-0.3.5-noarch-1xinc.tgz:
Updated to 0.3.5.
2  kde-apps/kde-servicemenu-pdf/kde-servicemenu-pdf.SlackBuild
View
@@ -41,7 +41,7 @@ PNAME=servicemenu-pdf
NAME=kde-${PNAME}
PKG=${PKG:-${TMP}/package-${NAME}}
-VERSION=${VERSION:-0.3.5}
+VERSION=${VERSION:-0.4}
ARCH=noarch
if [ "${ARCH}" = "x86_64" ] ;then
SLKTARGET=${SLKTARGET:-x86_64}
4 klavaro/ChangeLog.SB
View
@@ -1,3 +1,7 @@
+Tue Aug 24 20:37:21 BRT 2010
+klavaro-1.7.0-x86_64-1xinc.tgz:
+Updated to 1.7.0.
++--------------------------+
Sun Feb 28 21:26:12 BRT 2010
klavaro-1.5.0-x86_64-1xinc.tgz:
Updated to 1.5.0.
12 klavaro/klavaro.SlackBuild
View
@@ -43,7 +43,7 @@ fi
NAME=klavaro
PKG=${PKG:-${TMP}/package-${NAME}}
-VERSION=${VERSION:-1.5.0}
+VERSION=${VERSION:-1.7.0}
DVER=${DVER:-1.0.8}
if [ "${SB_NATIVE}" = "YES" ] ;then
ARCH=${ARCH:-$(uname -m)}
@@ -139,12 +139,8 @@ find ${PKG} | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
mkdir -p ${PKG}/usr/share/applications
-zcat ${CWD}/${NAME}.desktop.gz > \
- ${PKG}/usr/share/applications/${NAME}.desktop || exit 1
-
-mkdir -p ${PKG}/usr/share/icons/hicolor/32x32/apps
-zcat ${CWD}/${NAME}.png.gz > \
- ${PKG}/usr/share/icons/hicolor/32x32/apps/${NAME}.png || exit 1
+zcat ${CWD}/${NAME}.desktop.gz \
+ > ${PKG}/usr/share/applications/${NAME}.desktop || exit 1
# Add a documentation directory:
mkdir -p ${DOCDIR}
@@ -186,7 +182,7 @@ if [ "${SB_REP}" = "YES" ] ;then
# Replicate slackbuild and patches
mkdir -p ${SBDIR}
install -m0644 ${CWD}/slack-desc ${CWD}/slack-required ${CWD}/ChangeLog.SB \
- ${CWD}/${NAME}.desktop.gz ${CWD}/${NAME}.png.gz ${SBDIR}/
+ ${CWD}/${NAME}.desktop.gz ${SBDIR}/
install -m0755 ${CWD}/${NAME}.SlackBuild \
${SBDIR}/${NAME}.SlackBuild
fi
4 libdbusmenu-qt/ChangeLog.SB
View
@@ -1,3 +1,7 @@
+Tue Aug 24 18:29:25 BRT 2010
+libdbusmenu-qt-0.6.0-x86_64-1xinc.tgz:
+Updated to 0.6.0.
++--------------------------+
Tue Aug 10 19:05:58 BRT 2010
libdbusmenu-qt-0.5.2-x86_64-1xinc.tgz:
Updated to 0.5.2.
2  libdbusmenu-qt/apply-patches.sh
View
@@ -3,6 +3,6 @@ set -e -o pipefail
SB_PATCHDIR=${CWD}/patches
-patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/dbusmenu-qt-0.3.2-pkgconfig.patch
+# patch -p0 -E --backup --verbose -i ${SB_PATCHDIR}/${NAME}.patch
set +e +o pipefail
3  libdbusmenu-qt/libdbusmenu-qt.SlackBuild
View
@@ -43,7 +43,7 @@ fi
NAME=libdbusmenu-qt
PKG=${PKG:-${TMP}/package-${NAME}}
-VERSION=${VERSION:-0.5.2}
+VERSION=${VERSION:-0.6.0}
if [ "${SB_NATIVE}" = "YES" ] ;then
ARCH=${ARCH:-$(uname -m)}
else
@@ -108,7 +108,6 @@ cd ${SRCDIR} || exit 1
chmod -R u+w,go+r-w,a-s .
-# zcat ${CWD}/${NAME}.patch.gz | patch -p0 -E --backup --verbose || exit 1
if [ -r ${CWD}/apply-patches.sh ]; then
. ${CWD}/apply-patches.sh || exit 1
fi
11 libdbusmenu-qt/patches/dbusmenu-qt-0.3.2-pkgconfig.patch
View
@@ -1,11 +0,0 @@
-diff -up libdbusmenu-qt-0.3.2/dbusmenu-qt.pc.in.pkgconfig libdbusmenu-qt-0.3.2/dbusmenu-qt.pc.in
---- libdbusmenu-qt-0.3.2/dbusmenu-qt.pc.in.pkgconfig 2010-04-02 09:38:25.000000000 -0500
-+++ libdbusmenu-qt-0.3.2/dbusmenu-qt.pc.in 2010-04-25 16:50:29.729374725 -0500
-@@ -1,6 +1,6 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
--libdir=@CMAKE_INSTALL_PREFIX@/lib
-+libdir=@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@
- includedir=@CMAKE_INSTALL_PREFIX@/include/dbusmenu-qt
-
- Name: libdbusmenu-qt
4 libsndfile/ChangeLog.SB
View
@@ -1,3 +1,7 @@
+Wed Aug 25 19:17:39 BRT 2010
+libsndfile-1.0.21-x86_64-2xinc.tgz:
+Rebuilt.
++--------------------------+
Wed Dec 30 16:36:20 BRST 2009
libsndfile-1.0.21-x86_64-1xinc.tgz:
Updated to 1.0.21.
10 libsndfile/libsndfile-compat32.SlackBuild
View
@@ -52,7 +52,7 @@ else
fi
SLKTARGET32=${SLKTARGET32:-i486}
SLKDTARGET=${SLKDTARGET:-slackware}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NJOBS=${NJOBS:-$(( $(getconf _NPROCESSORS_ONLN) + 1 ))}
DOCDIR=${PKG}/usr/doc/${NAME}-${VERSION}
SBDIR=${PKG}/usr/src/slackbuilds/${PNAME}
@@ -99,7 +99,6 @@ cd ${SRCDIR} || exit 1
chmod -R u+w,go+r-w,a-s .
-# zcat ${CWD}/${NAME}.patch.gz | patch -p0 -E --backup --verbose || exit 1
if [ -r ${CWD}/apply-patches.sh ]; then
. ${CWD}/apply-patches.sh || exit 1
fi
@@ -113,6 +112,7 @@ CXXFLAGS="${SLKCFLAGS}" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
+ --includedir=/usr/include/sndfile \
--sysconfdir=/etc \
--localstatedir=/var/lib \
--infodir=/usr/info \
@@ -128,7 +128,11 @@ make install DESTDIR=${PKG} || exit 1
rm -f ${PKG}/usr/lib*/*.la
-rm -rf ${PKG}/usr/{bin,sbin,doc,include,libexec,man,info,share} ${PKG}/{etc,var}
+rm -rf ${PKG}/usr/{bin,sbin,doc,libexec,man,info,share} ${PKG}/{etc,var}
+
+mv ${PKG}/usr/include/sndfile/sndfile.h sndfile-32.h || exit 1
+rm -rf ${PKG}/usr/include/sndfile/*
+mv sndfile-32.h ${PKG}/usr/include/sndfile/sndfile-32.h || exit 1
find ${PKG} | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
35 libsndfile/libsndfile.SlackBuild
View
@@ -55,7 +55,7 @@ else
SLKTARGET=${SLKTARGET:-i486}
fi
SLKDTARGET=${SLKDTARGET:-slackware}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NJOBS=${NJOBS:-$(( $(getconf _NPROCESSORS_ONLN) + 1 ))}
DOCDIR=${PKG}/usr/doc/${NAME}-${VERSION}
SBDIR=${PKG}/usr/src/slackbuilds/${NAME}
@@ -108,7 +108,6 @@ cd ${SRCDIR} || exit 1
chmod -R u+w,go+r-w,a-s .
-# zcat ${CWD}/${NAME}.patch.gz | patch -p0 -E --backup --verbose || exit 1
if [ -r ${CWD}/apply-patches.sh ]; then
. ${CWD}/apply-patches.sh || exit 1
fi
@@ -122,6 +121,7 @@ CXXFLAGS="${SLKCFLAGS}" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
+ --includedir=/usr/include/sndfile \
--sysconfdir=/etc \
--localstatedir=/var/lib \
--infodir=/usr/info \
@@ -141,6 +141,33 @@ make install DESTDIR=${PKG} || exit 1
rm -f ${PKG}/usr/lib*/*.la
+unset MARCH
+case "${ARCH}" in
+ i[3-6]86) MARCH=32
+ ;;
+ s390) MARCH=32
+ ;;
+ x86_64) MARCH=64
+ ;;
+esac
+
+if [ -n "${MARCH}" ] ;then
+ mv ${PKG}/usr/include/sndfile/sndfile.h \
+ ${PKG}/usr/include/sndfile/sndfile-${MARCH}.h || exit 1
+
+cat > ${PKG}/usr/include/sndfile/sndfile.h <<'EOF'
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "sndfile-32.h"
+#elif __WORDSIZE == 64
+#include "sndfile-64.h"
+#else
+# error "unexpected value for __WORDSIZE macro"
+#endif
+EOF
+fi
+
find ${PKG} | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -152,10 +179,12 @@ mkdir -p ${DOCDIR}
mv ${PKG}/usr/share/doc/libsndfile1-dev/html ${DOCDIR}/
rm -rf ${PKG}/usr/share/doc
cp -a \
- AUTHORS COPYING ChangeLog LICENSE README NEWS THANKS TODO ${CWD}/ChangeLog.SB \
+ AUTHORS COPYING LICENSE README NEWS THANKS TODO ${CWD}/ChangeLog.SB \
${DOCDIR}/
+[ -r ChangeLog ] && head -n 1000 ChangeLog > ${DOCDIR}/ChangeLog
find ${DOCDIR}/ -type d -print0 | xargs -0 chmod 0755
find ${DOCDIR}/ -type f -print0 | xargs -0 chmod 0644
+find ${DOCDIR}/ -type f -size 0 -print0 | xargs -0 rm -f
# Compress and link manpages, if any:
if [ -d ${PKG}/usr/share/man ]; then
4 mpc/ChangeLog.SB
View
@@ -0,0 +1,4 @@
+Wed Aug 25 18:24:04 BRT 2010
+mpc-0.19-x86_64-1xinc.tgz:
+First SB.
++--------------------------+
214 mpc/mpc.SlackBuild
View
@@ -0,0 +1,214 @@
+#!/bin/sh
+#-- mpc for Slackware --
+# Build script by Phantom X <megaphantomx@bol.com.br>
+# Suggested usage: $ mpc.SlackBuild 2>&1 | tee build.log
+#--
+# Copyright 2008, 2009, 2010 Phantom X, Goiania, Brazil.
+# Copyright 2006 Martijn Dekker, Groningen, Netherlands.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# http://mpd.wikia.com/wiki/Client:Mpc
+
+PACKAGER_ID=${PACKAGER_ID:-$USER}
+PACKAGER=${PACKAGER:-$USER@$HOSTNAME}
+
+# Set YES for native build with gcc >= 4.2
+SB_NATIVE=${SB_NATIVE:-NO}
+
+# Set to YES to replicate slackbuild and patches
+SB_REP=${SB_REP:-YES}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+if [ ! -d ${TMP} ]; then
+ mkdir -p ${TMP}
+fi
+
+NAME=mpc
+PKG=${PKG:-${TMP}/package-${NAME}}
+
+VERSION=${VERSION:-0.19}
+if [ "${SB_NATIVE}" = "YES" ] ;then
+ ARCH=${ARCH:-$(uname -m)}
+else
+ ARCH=${ARCH:-x86_64}
+fi
+if [ "${ARCH}" = "x86_64" ] ;then
+ SLKTARGET=${SLKTARGET:-x86_64}
+else
+ SLKTARGET=${SLKTARGET:-i486}
+fi
+SLKDTARGET=${SLKDTARGET:-slackware}
+BUILD=${BUILD:-1}
+NJOBS=${NJOBS:-$(( $(getconf _NPROCESSORS_ONLN) + 1 ))}
+DOCDIR=${PKG}/usr/doc/${NAME}-${VERSION}
+SBDIR=${PKG}/usr/src/slackbuilds/${NAME}
+PKGDEST=${PKGDEST:-${CWD}}
+PKGFORMAT=${PKGFORMAT:-txz}
+PKGNAME=${NAME}-$(echo ${VERSION} | tr - . )-${ARCH}-${BUILD}${PACKAGER_ID}
+
+DATE=$(LC_ALL=C date +%d-%b-%Y)
+
+SRCDIR=${NAME}-${VERSION}
+SRCARCHIVE=${SRCDIR}.tar.bz2
+
+DL_PROG=${DL_PROG:-wget}
+DL_TO=${DL_TO:-5}
+DL_OPTS=${DL_OPTS:-"--timeout=${DL_TO}"}
+SF_MIRROR=${SF_MIRROR:-http://prdownloads.sourceforge.net}
+DL_URL="${SF_MIRROR}/musicpd/${SRCARCHIVE}"
+
+# if source is not present, download in source rootdir if possible
+test -r ${CWD}/${SRCARCHIVE} || ${DL_PROG} ${DL_OPTS} ${DL_URL} || exit 1
+
+if [ "${SB_NATIVE}" = "YES" ] ;then
+ SLKCFLAGS="-O2 -march=native -mtune=native ${SB_ECFLAGS} -pipe"
+else
+ case "${ARCH}" in
+ i[3-6]86) SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686"
+ ;;
+ x86_64) SLKCFLAGS="-O2 -fPIC"
+ ;;
+ s390|*) SLKCFLAGS="-O2"
+ ;;
+ esac
+fi
+if [ "${ARCH}" = "x86_64" ] ;then
+ LIBDIRSUFFIX="64"
+ SLKCFLAGS="${SLKCFLAGS} -fPIC"
+else
+ LIBDIRSUFFIX=""
+fi
+
+if [ -d ${PKG} ]; then
+ # Clean up a previous build
+ rm -rf ${PKG}
+fi
+mkdir -p ${PKG}
+
+cd ${TMP}
+rm -rf ${SRCDIR}
+tar -xvf ${CWD}/${SRCARCHIVE} || exit 1
+cd ${SRCDIR} || exit 1
+
+chmod -R u+w,go+r-w,a-s .
+
+# zcat ${CWD}/${NAME}.patch.gz | patch -p0 -E --backup --verbose || exit 1
+
+CFLAGS="${SLKCFLAGS}" \
+CXXFLAGS="${SLKCFLAGS}" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var/lib \
+ --infodir=/usr/info \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/${NAME}-${VERSION} \
+ --build=${SLKTARGET}-${SLKDTARGET}-linux || exit $?
+
+make -j${NJOBS} || make || exit $?
+make install DESTDIR=${PKG} || exit $?
+
+find ${PKG} | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+mkdir -p ${PKG}/etc/bash_completion.d
+cp -p doc/mpc-completion.bash ${PKG}/etc/bash_completion.d/ || exit 1
+
+# Add a documentation directory:
+mkdir -p ${DOCDIR}
+cp -a \
+ ${CWD}/ChangeLog.SB \
+ ${DOCDIR}/
+[ -r ChangeLog ] && head -n 1000 ChangeLog > ${DOCDIR}/ChangeLog
+rm -f ${DOCDIR}/mpc-completion.bash
+find ${DOCDIR}/ -type d -print0 | xargs -0 chmod 0755
+find ${DOCDIR}/ -type f -print0 | xargs -0 chmod 0644
+find ${DOCDIR}/ -type f -size 0 -print0 | xargs -0 rm -f
+
+# Compress and link manpages, if any:
+if [ -d ${PKG}/usr/share/man ]; then
+ mv ${PKG}/usr/share/man ${PKG}/usr/man
+ rmdir ${PKG}/usr/share
+fi
+if [ -d ${PKG}/usr/man ]; then
+ ( cd ${PKG}/usr/man
+ for manpagedir in $(find . -type d -name "man*") ; do
+ ( cd ${manpagedir}
+ for eachpage in $( find . -type l -maxdepth 1) ; do
+ ln -s $( readlink ${eachpage} ).gz ${eachpage}.gz
+ rm -f ${eachpage}
+ done
+ gzip -9 *.?
+ # Prevent errors
+ rm -f *.gz.gz
+ )
+ done
+ )
+fi
+
+mkdir -p ${PKG}/install
+cat ${CWD}/slack-desc > ${PKG}/install/slack-desc
+cat ${CWD}/slack-required > ${PKG}/install/slack-required
+
+sed -i "s|_PACKAGER|${PACKAGER}|g; s|_BUILD_DATE|${DATE}|g" \
+ ${PKG}/install/slack-desc
+
+if [ "${SB_REP}" = "YES" ] ;then
+ # Replicate slackbuild and patches
+ mkdir -p ${SBDIR}
+ install -m0644 ${CWD}/slack-desc ${CWD}/slack-required ${CWD}/ChangeLog.SB \
+ ${SBDIR}/
+ install -m0755 ${CWD}/${NAME}.SlackBuild \
+ ${SBDIR}/${NAME}.SlackBuild
+fi
+
+# Build package:
+set +o xtrace # no longer print commands upon execution
+
+ROOTCOMMANDS="set -o errexit -o xtrace ; cd ${PKG} ;
+ /bin/chown --recursive root:root . ;"
+
+ROOTCOMMANDS="${ROOTCOMMANDS}
+ /sbin/makepkg --linkadd y --chown n ${PKGDEST}/${PKGNAME}.${PKGFORMAT} "
+
+if test ${UID} = 0; then
+ eval ${ROOTCOMMANDS}
+ set +o xtrace
+elif test "$(type -t fakeroot)" = 'file'; then
+ echo -e "\e[1mEntering fakeroot environment.\e[0m"
+ echo ${ROOTCOMMANDS} | fakeroot
+else
+ echo -e "\e[1mPlease enter your root password.\e[0m (Consider installing fakeroot.)"
+ /bin/su -c "${ROOTCOMMANDS}"
+fi
+
+# Clean up the extra stuff:
+if [ "$1" = "--cleanup" ]; then
+ echo "Cleaning..."
+ if [ -d ${TMP}/${SRCDIR} ]; then
+ rm -rf ${TMP}/${SRCDIR} && echo "${TMP}/${SRCDIR} cleanup completed"
+ fi
+ if [ -d ${PKG} ]; then
+ rm -rf ${PKG} && echo "${PKG} cleanup completed"
+ fi
+ rmdir ${TMP} && echo "${TMP} cleanup completed"
+fi
+exit 0
12 mpc/slack-desc
View
@@ -0,0 +1,12 @@
+mpc|-----handy-ruler------------------------------------------------------|
+mpc: mpc (Command-line client for MPD)
+mpc:
+mpc: A client for MPD, the Music Player Daemon. mpc connects to a MPD
+mpc: running on a machine via a network.
+mpc:
+mpc: http://mpd.wikia.com/wiki/Client:Mpc
+mpc:
+mpc:
+mpc: Packager: _PACKAGER on _BUILD_DATE
+mpc:
+mpc:
1  mpc/slack-required
View
@@ -0,0 +1 @@
+libmpdclient >= 2.2
8 mpd/ChangeLog.SB
View
@@ -1,3 +1,11 @@
+Wed Aug 25 18:41:18 BRT 2010
+mpd-0.16_alpha2-x86_64-1xinc.tgz:
+Updated to 0.16_alpha2.
++--------------------------+
+Tue Aug 24 21:36:20 BRT 2010
+mpd-0.15.12-x86_64-1xinc.tgz:
+Updated to 0.15.12.
++--------------------------+
Mon May 31 17:54:17 BRT 2010
mpd-0.5.10-x86_64-1xinc.tgz:
Updated to 0.5.10.
28 mpd/mpd.SlackBuild
View
@@ -43,7 +43,7 @@ fi
NAME=mpd
PKG=${PKG:-${TMP}/package-${NAME}}
-VERSION=${VERSION:-0.15.10}
+VERSION=${VERSION:-0.16_alpha2}
if [ "${SB_NATIVE}" = "YES" ] ;then
ARCH=${ARCH:-$(uname -m)}
else
@@ -68,8 +68,8 @@ DATE=$(LC_ALL=C date +%d-%b-%Y)
grep --quiet '^mpd:' /etc/group && SB_HGROUP=1
grep --quiet '^mpd:' /etc/passwd && SB_HUSER=1
-SRCDIR=${NAME}-${VERSION}
-SRCARCHIVE=${SRCDIR}.tar.bz2
+SRCDIR=${NAME}-${VERSION//_/\~}
+SRCARCHIVE=${NAME}-${VERSION}.tar.bz2
DL_PROG=${DL_PROG:-wget}
DL_TO=${DL_TO:-5}
@@ -114,7 +114,10 @@ chmod -R u+w,go+r-w,a-s .
# zcat ${CWD}/${NAME}.patch.gz | patch -p0 -E --backup --verbose || exit 1
-sed -r -i -e '/LAME_LIBS/s,\$(lame_|)prefix/lib",$libdir",g' m4/lame.m4 || exit 1
+sed -i -e '/include/s|<sndfile.h>|<sndfile/sndfile.h>|g' \
+ src/decoder/sndfile_decoder_plugin.c || exit 1
+
+sed -r -i -e '/FAAD_LIBS/s,\$(faad_|)prefix/lib",$libdir",g' m4/faad.m4 || exit 1
NOCONFIGURE=1 sh ./autogen.sh || exit 1
@@ -130,12 +133,18 @@ CXXFLAGS="${SLKCFLAGS}" \
--docdir=/usr/doc/${NAME}-${VERSION} \
--enable-alsa \
--enable-ao \
+ --enable-openal \
--enable-pipe-output \
--enable-jack \
--enable-lastfm \
--enable-mms \
--enable-ffmpeg \
+ --enable-gme \
+ --enable-lame-encoder \
+ --enable-sndfile \
+ --enable-wildmidi \
--enable-sqlite \
+ --with-zeroconf=avahi \
--build=${SLKTARGET}-${SLKDTARGET}-linux || exit 1
make -j${NJOBS} || make || exit 1
@@ -158,8 +167,8 @@ install -pm0755 ${CWD}/rc.${NAME} \
${PKG}/etc/rc.d/rc.${NAME}.new || exit 1
mkdir -p ${PKG}/var/log/setup
-zcat ${CWD}/setup.onlyonce.rc${NAME}.gz > \
- ${PKG}/var/log/setup/setup.onlyonce.rc${NAME} || exit 1
+zcat ${CWD}/setup.onlyonce.rc${NAME}.gz \
+ > ${PKG}/var/log/setup/setup.onlyonce.rc${NAME} || exit 1
chmod 0755 ${PKG}/var/log/setup/setup.onlyonce.rc${NAME}
mkdir -p ${PKG}/var/lib/${NAME}/playlists
@@ -168,6 +177,7 @@ touch ${PKG}/var/lib/${NAME}/mpd.log.new
touch ${PKG}/var/lib/${NAME}/mpd.error.new
touch ${PKG}/var/lib/${NAME}/mpd.db.new
touch ${PKG}/var/lib/${NAME}/mpdstate.new
+touch ${PKG}/var/lib/${NAME}/sticker.sql.new
install -p -m644 doc/mpdconf.example ${PKG}/etc/mpd.conf.new
sed -i \
-e "s,~/music,/var/lib/${NAME}/music,g" \
@@ -177,6 +187,7 @@ sed -i \
-e "s,~/.mpd/database,/var/lib/${NAME}/mpd.db,g" \
-e "s,~/.mpd/pid,/var/lib/${NAME}/mpd.pid,g" \
-e "s,~/.mpd/state,/var/lib/${NAME}/mpdstate,g" \
+ -e "s,~/.mpd/sticker.sql,/var/lib/${NAME}/sticker.sql,g" \
-e "s,~/.mpd/socket,/var/lib/${NAME}/mpdsocket,g" \
-e "s,#state_file,state_file,g" \
-e 's,^#user.*"nobody",user "mpd",g' \
@@ -184,8 +195,8 @@ sed -i \
${PKG}/etc/mpd.conf.new
mkdir -p ${PKG}/usr/share/hal/fdi/policy/20thirdparty
-zcat ${CWD}/95-grant-audio-devices-to-mpd.fdi.gz > \
- ${PKG}/usr/share/hal/fdi/policy/20thirdparty/95-grant-audio-devices-to-mpd.fdi || exit 1
+zcat ${CWD}/95-grant-audio-devices-to-mpd.fdi.gz \
+ > ${PKG}/usr/share/hal/fdi/policy/20thirdparty/95-grant-audio-devices-to-mpd.fdi || exit 1
rm -rf ${PKG}/usr/share/doc
@@ -322,6 +333,7 @@ EOF
( cd ${PKG}
find etc/ -name *.new -exec echo config {} ';' | sort >> ${PKG}/install/doinst.sh
find var/ -name *.new -exec echo config {} ';' | sort >> ${PKG}/install/doinst.sh
+ find var/ -name '*.new' -a -size 0 -exec echo rm -f {} ';' | sort >> ${PKG}/install/doinst.sh
echo >> ${PKG}/install/doinst.sh
)
9 mpd/slack-required
View
@@ -1,8 +1,10 @@
alsa-lib >= 1.0.19
audiofile >= 0.2.6
avahi >= 0.6.24
+faad2 >= 2.7
ffmpeg >= 20090328
flac >= 1.2.1
+game-music-emu >= 0.5.5
jack >= 0.116.2
lame >= 3.98.2
libao >= 0.8.8
@@ -12,11 +14,16 @@ libid3tag >= 0.15.1b
libmad >= 0.15.1b
libmms >= 0.4
libmodplug >= 0.8.7
-libmpcdec >= 1.2.6
libsamplerate >= 0.1.7
+libsndfile >= 1.0.21
libshout >= 2.2.2
libvorbis >= 20090207
+mpg123 >= 1.12.3
+musepack >= r435
+openal >= 1.12.854
pulseaudio >= 0.9.14
sqlite >= 3.6.17
+twolame >= 0.3.12
wavpack >= 4.50.1
+wildmidi >= 0.2.3.4
zlib >= 1.2.3
4 mpdscribble/ChangeLog.SB
View
@@ -1,3 +1,7 @@
+Wed Aug 25 14:26:04 BRT 2010
+mpdscribble-0.19-x86_64-2xinc.tgz:
+Build curl and soup binaries and added a wrapper to select one.
++--------------------------+
Thu Jun 17 05:14:57 BRT 2010
mpdscribble-0.19-x86_64-1xinc.tgz:
First SB.
53 mpdscribble/mpdscribble.SlackBuild
View
@@ -55,7 +55,7 @@ else
SLKTARGET=${SLKTARGET:-i486}
fi
SLKDTARGET=${SLKDTARGET:-slackware}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NJOBS=${NJOBS:-$(( $(getconf _NPROCESSORS_ONLN) + 1 ))}
DOCDIR=${PKG}/usr/doc/${NAME}-${VERSION}
SBDIR=${PKG}/usr/src/slackbuilds/${NAME}
@@ -63,6 +63,9 @@ PKGDEST=${PKGDEST:-${CWD}}
PKGFORMAT=${PKGFORMAT:-txz}
PKGNAME=${NAME}-$(echo ${VERSION} | tr - . )-${ARCH}-${BUILD}${PACKAGER_ID}
+# Set to YES to add libsoup binary too
+SB_SOUP=${SB_SOUP:-YES}
+
DATE=$(LC_ALL=C date +%d-%b-%Y)
SRCDIR=${NAME}-${VERSION}
@@ -111,20 +114,38 @@ chmod -R u+w,go+r-w,a-s .
# zcat ${CWD}/${NAME}.patch.gz | patch -p0 -E --backup --verbose || exit 1
+SB_CONFIGURE(){
CFLAGS="${SLKCFLAGS}" \
CXXFLAGS="${SLKCFLAGS}" \
-./configure \
+../configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
- --localstatedir=/var/lib \
+ --localstatedir=/var \
--infodir=/usr/info \
--mandir=/usr/man \
--docdir=/usr/doc/${NAME}-${VERSION} \
- --build=${SLKTARGET}-${SLKDTARGET}-linux || exit $?
+ --build=${SLKTARGET}-${SLKDTARGET}-linux $@
+}
-make -j${NJOBS} || make || exit $?
-make install DESTDIR=${PKG} || exit $?
+mkdir curl-build
+( cd curl-build
+ SB_CONFIGURE \
+ --with-http-client=curl || exit $?
+ make -j${NJOBS} || make || exit $?
+ make install DESTDIR=${PKG} || exit $?
+ mv ${PKG}/usr/bin/${NAME} ${PKG}/usr/bin/${NAME}-curl || exit $?
+) || exit $?
+
+if [ "${SB_SOUP}" = "YES" ] ;then
+mkdir soup-build
+( cd soup-build
+ SB_CONFIGURE \
+ --with-http-client=soup || exit $?
+ make -j${NJOBS} || make || exit $?
+ install -pm0755 src/${NAME} ${PKG}/usr/bin/${NAME}-soup || exit $?
+) || exit $?
+fi
rm -f ${PKG}/etc/*${NAME}.conf
install -pm0600 doc/${NAME}.conf ${PKG}/etc/${NAME}.conf.new || exit 1
@@ -142,6 +163,26 @@ install -pm0755 ${CWD}/setup.onlyonce.rc${NAME} \
find ${PKG} | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+cat > ${PKG}/usr/bin/${NAME} <<EOF
+#!/bin/sh
+# ${NAME} wrapper
+
+[ -e /etc/default/${NAME} ] && . /etc/default/${NAME}
+
+if [ -x /usr/bin/${NAME}-soup ] && [ "\${MPDSCRIBBLE_HTTP}" = "soup" ] ; then
+ exec /usr/bin/${NAME}-soup "\$@"
+else
+ exec /usr/bin/${NAME}-curl "\$@"
+fi
+EOF
+chmod 0755 ${PKG}/usr/bin/${NAME}
+
+mkdir -p ${PKG}/etc/default
+cat > ${PKG}/etc/default/${NAME}.new <<'EOF'
+# Set http client binary type (curl or soup)
+MPDSCRIBBLE_HTTP=curl
+EOF
+
# Add a documentation directory:
mkdir -p ${DOCDIR}
cp -a \
11 mpdscribble/rc.mpdscribble
View
@@ -3,8 +3,15 @@
# description: mpd client which submits information about tracks being played to Last.fm
# processname: mpdscribble
-exec="/usr/bin/mpdscribble"
-prog=$(basename ${exec})
+[ -e /etc/default/mpdscribble ] && . /etc/default/mpdscribble
+
+MPDSCRIBBLE_HTTP=${MPDSCRIBBLE_HTTP:-curl}
+if [ -x "/usr/bin/mpdscribble-${MPDSCRIBBLE_HTTP}" ] ; then
+ exec="/usr/bin/mpdscribble-${MPDSCRIBBLE_HTTP}"
+else
+ exec="/usr/bin/mpdscribble-curl"
+fi
+prog=$(basename ${exec} | cut -d- -f1 )
lockfile=/var/lock/subsys/${prog}
[ -f /etc/${prog}.conf ] || exit 0
4 mpdsetup/ChangeLog.SB
View
@@ -0,0 +1,4 @@
+Wed Aug 25 16:51:53 BRT 2010
+mpdsetup-20100825-x86_64-1xinc.tgz:
+First SB.
++--------------------------+
39 mpdsetup/mpdsetup-snapshot.sh
View
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+set -e
+
+module=$(basename $0 -snapshot.sh)
+snaproot="http://github.com/magcius/${module}.git"
+
+tmp=$(mktemp -d)
+
+trap cleanup EXIT
+cleanup() {
+ set +e
+ [ -z "${tmp}" -o ! -d "${tmp}" ] || rm -rf "${tmp}"
+}
+
+unset CDPATH
+unset SNAP_COOPTS
+pwd=$(pwd)
+snap=${snap:-$(date +%Y%m%d)}
+gitbranch=${gitbranch:-master}
+gittree=${gittree:-master}
+
+[ "${snap}" = "$(date +%Y%m%d)" ] && SNAP_COOPTS="--depth 1"
+[ "${gitbranch}" = "${master}" ] || gitbranch="origin/${gitbranch}"
+
+pushd "${tmp}"
+ git clone ${SNAP_COOPTS} ${snaproot} ${module}-${snap}
+ pushd ${module}-${snap}
+ if [ "${snap}" != "$(date +%Y%m%d)" ] ; then
+ gitdate="$(echo -n ${snap} | head -c -4)-$(echo -n ${snap} | tail -c -4|head -c -2)-$(echo -n ${snap} | tail -c -2)"
+ git checkout $(git rev-list -n 1 --before="${gitdate}" master)
+ gittree=$(git reflog | grep 'HEAD@{0}' | awk '{print $1}')
+ fi
+ rm -rf python-mpd mpd.py
+ find . -type d -name .git -print0 | xargs -0r rm -rf
+ rm -f .gitignore config.git-hash .gitmodules
+ popd
+ tar -Jcf "${pwd}"/${module}-${snap}.tar.xz ${module}-${snap}
+popd >/dev/null
221 mpdsetup/mpdsetup.SlackBuild
View
@@ -0,0 +1,221 @@
+#!/bin/sh
+#-- mpdsetup for Slackware --
+# Build script by Phantom X <megaphantomx@bol.com.br>
+# Suggested usage: $ mpdsetup.SlackBuild 2>&1 | tee build.log
+#--
+# Copyright 2008, 2009, 2010 Phantom X, Goiania, Brazil.
+# Copyright 2006 Martijn Dekker, Groningen, Netherlands.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# http://mpd.wikia.com/wiki/Hack:mpdnotify
+# http://github.com/magcius/mpdsetup
+
+PACKAGER_ID=${PACKAGER_ID:-$USER}
+PACKAGER=${PACKAGER:-$USER@$HOSTNAME}
+
+# Set YES for native build with gcc >= 4.2
+SB_NATIVE=${SB_NATIVE:-NO}
+
+# Set to YES to replicate slackbuild and patches
+SB_REP=${SB_REP:-YES}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+if [ ! -d ${TMP} ]; then
+ mkdir -p ${TMP}
+fi
+
+SNAPBUILD=${SNAPBUILD:-YES}
+
+NAME=mpdsetup
+PKG=${PKG:-${TMP}/package-${NAME}}
+
+if [ "${SNAPBUILD}" = "YES" ] ;then
+ VERSION=${VERSION:-"$(LC_ALL=C date +%Y%m%d)"}
+else
+ VERSION=${VERSION:-0}
+fi
+if [ "${SB_NATIVE}" = "YES" ] ;then
+ ARCH=${ARCH:-$(uname -m)}
+else
+ ARCH=${ARCH:-x86_64}
+fi
+if [ "${ARCH}" = "x86_64" ] ;then
+ SLKTARGET=${SLKTARGET:-x86_64}
+else
+ SLKTARGET=${SLKTARGET:-i486}
+fi
+SLKDTARGET=${SLKDTARGET:-slackware}
+BUILD=${BUILD:-1}
+NJOBS=${NJOBS:-$(( $(getconf _NPROCESSORS_ONLN) + 1 ))}
+DOCDIR=${PKG}/usr/doc/${NAME}-${VERSION}
+SBDIR=${PKG}/usr/src/slackbuilds/${NAME}
+PKGDEST=${PKGDEST:-${CWD}}
+PKGFORMAT=${PKGFORMAT:-tgz}