Skip to content
This repository
Browse code

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 August 26, 2010

Showing 138 changed files with 2,971 additions and 568 deletions. Show diff stats Hide diff stats

  1. 108  ChangeLog.All
  2. 4  audacious-plugins/ChangeLog.SB
  3. 4  audacious-plugins/audacious-plugins.SlackBuild
  4. 4  audacious/ChangeLog.SB
  5. 2  audacious/audacious.SlackBuild
  6. 4  dstat/ChangeLog.SB
  7. 10  dstat/apply-patches.sh
  8. 17  dstat/dstat.SlackBuild
  9. 0  dstat/{ → patches}/dstat-0.6.8-dbus.patch.gz
  10. 106  dstat/patches/dstat-0.7.2-bits.patch
  11. 4  feh/ChangeLog.SB
  12. 2  feh/feh.SlackBuild
  13. 4  file/ChangeLog.SB
  14. 1  file/apply-patches.sh
  15. 2  file/file.SlackBuild
  16. 16  file/patches/file-5.04-webm.patch
  17. 4  game-music-emu/ChangeLog.SB
  18. 2  game-music-emu/apply-patches.sh
  19. 18  game-music-emu/game-music-emu.SlackBuild
  20. 491  game-music-emu/patches/01_symbol-exports.patch
  21. 4  gnome/empathy/ChangeLog.SB
  22. 11  gnome/empathy/empathy.SlackBuild
  23. 4  gnome/system-config-printer/ChangeLog.SB
  24. 2  gnome/system-config-printer/system-config-printer.SlackBuild
  25. 4  highlight/ChangeLog.SB
  26. 2  highlight/highlight.SlackBuild
  27. 4  inkscape/ChangeLog.SB
  28. 7  inkscape/apply-patches.sh
  29. 4  inkscape/inkscape.SlackBuild
  30. 81  inkscape/patches/inkscape-0.47-gcc45.patch
  31. BIN  inkscape/patches/inkscape-0.47-poppler-0.12.2.patch.gz
  32. 72  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  john/ChangeLog.SB
  36. 2  john/john.SlackBuild
  37. 4  kde-apps/kde-servicemenu-pdf/ChangeLog.SB
  38. 2  kde-apps/kde-servicemenu-pdf/kde-servicemenu-pdf.SlackBuild
  39. 4  klavaro/ChangeLog.SB
  40. 12  klavaro/klavaro.SlackBuild
  41. 4  libdbusmenu-qt/ChangeLog.SB
  42. 2  libdbusmenu-qt/apply-patches.sh
  43. 3  libdbusmenu-qt/libdbusmenu-qt.SlackBuild
  44. 11  libdbusmenu-qt/patches/dbusmenu-qt-0.3.2-pkgconfig.patch
  45. 4  libsndfile/ChangeLog.SB
  46. 10  libsndfile/libsndfile-compat32.SlackBuild
  47. 35  libsndfile/libsndfile.SlackBuild
  48. 4  mpc/ChangeLog.SB
  49. 214  mpc/mpc.SlackBuild
  50. 12  mpc/slack-desc
  51. 1  mpc/slack-required
  52. 8  mpd/ChangeLog.SB
  53. 28  mpd/mpd.SlackBuild
  54. 9  mpd/slack-required
  55. 4  mpdscribble/ChangeLog.SB
  56. 53  mpdscribble/mpdscribble.SlackBuild
  57. 11  mpdscribble/rc.mpdscribble
  58. 4  mpdsetup/ChangeLog.SB
  59. 39  mpdsetup/mpdsetup-snapshot.sh
  60. 221  mpdsetup/mpdsetup.SlackBuild
  61. 12  mpdsetup/slack-desc
  62. 7  mpdsetup/slack-required
  63. 4  nodoka/gtk-nodoka-engine/ChangeLog.SB
  64. 11  nodoka/gtk-nodoka-engine/apply-patches.sh
  65. 11  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  nvidia-glx/nvidia-glx.SlackBuild
  71. 4  obexd/ChangeLog.SB
  72. 2  obexd/obexd.SlackBuild
  73. 4  podofo/ChangeLog.SB
  74. 2  podofo/podofo.SlackBuild
  75. 4  python-modules/pysmbc/ChangeLog.SB
  76. 14  python-modules/pysmbc/pysmbc.SlackBuild
  77. 4  python-modules/python-lepl/ChangeLog.SB
  78. 188  python-modules/python-lepl/python-lepl.SlackBuild
  79. 12  python-modules/python-lepl/slack-desc
  80. 1  python-modules/python-lepl/slack-required
  81. 4  python-modules/python-mpd-twisted/ChangeLog.SB
  82. 40  python-modules/python-mpd-twisted/python-mpd-twisted-snapshot.sh
  83. 198  python-modules/python-mpd-twisted/python-mpd-twisted.SlackBuild
  84. 12  python-modules/python-mpd-twisted/slack-desc
  85. 2  python-modules/python-mpd-twisted/slack-required
  86. 4  python-modules/python-mpd/ChangeLog.SB
  87. 36  python-modules/python-mpd/python-mpd.SlackBuild
  88. 4  python-modules/sk1libs/ChangeLog.SB
  89. 203  python-modules/sk1libs/sk1libs.SlackBuild
  90. 12  python-modules/sk1libs/slack-desc
  91. 6  python-modules/sk1libs/slack-required
  92. 1  python-modules/uniconvertor/slack-required
  93. 4  qbittorrent/ChangeLog.SB
  94. 2  qbittorrent/qbittorrent.SlackBuild
  95. 2  realplayer/realplayer.SlackBuild
  96. 4  ruby/ChangeLog.SB
  97. 4  ruby/ruby.SlackBuild
  98. 4  scons/ChangeLog.SB
  99. 2  scons/scons.SlackBuild
  100. 4  sqlite/ChangeLog.SB
  101. 2  sqlite/sqlite-compat32.SlackBuild
  102. 2  sqlite/sqlite.SlackBuild
  103. 4  squid/ChangeLog.SB
  104. 3  squid/apply-patches.sh
  105. 11  squid/patches/squid-3.1.6-external-dns.patch
  106. 10  squid/squid.SlackBuild
  107. 5  tigervnc/ChangeLog.SB
  108. 12  tigervnc/tigervnc.SlackBuild
  109. 2  xorg/xf86-input-joystick/xf86-input-joystick.SlackBuild
  110. 4  xorg/xf86-video-nouveau/ChangeLog.SB
  111. 4  xorg/xorg-server/ChangeLog.SB
  112. 23  xorg/xorg-server/apply-patches.sh
  113. 48  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. 46  xorg/xorg-server/patches/xserver-1.5.0-bg-none-root.patch
  116. 32  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  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  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  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. 43  xorg/xorg-server/patches/xserver-1.6.1-nouveau.patch
  125. 23  xorg/xorg-server/patches/xserver-1.6.99-default-modes.patch
  126. 51  xorg/xorg-server/patches/xserver-1.6.99-right-of.patch
  127. 18  xorg/xorg-server/patches/xserver-1.7.0-randr-gamma-restore.patch
  128. 34  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  xorg/xorg-server/patches/xserver-1.7.1-multilib.patch
  131. BIN  xorg/xorg-server/patches/xserver-1.7.1-multilib.patch.gz
  132. 142  xorg/xorg-server/patches/xserver-1.8-no-connected-outputs.patch
  133. 35  xorg/xorg-server/patches/xserver-1.8-randr-initial.patch
  134. 20  xorg/xorg-server/patches/xserver-1.8.0-force-hal-disable.patch
  135. 27  xorg/xorg-server/patches/xserver-1.8.0-no-xorg.patch
  136. 20  xorg/xorg-server/patches/xserver-1.9.0-force-hal-disable.patch
  137. 10  xorg/xorg-server/xorg-server.SlackBuild
  138. 84  xorg/xorg-server/xvfb-run.sh
108  ChangeLog.All
... ...
@@ -1,3 +1,111 @@
  1
+Thu Aug 26 02:04:54 BRT 2010
  2
+sk1libs-0.9.1-x86_64-1xinc.tgz
  3
++--------------------------+
  4
+Thu Aug 26 01:44:51 BRT 2010
  5
+inkscape-0.48.0-x86_64-1xinc.tgz
  6
++--------------------------+
  7
+Wed Aug 25 20:10:09 BRT 2010
  8
+audacious-plugins-2.4.0-x86_64-1xinc.tgz
  9
++--------------------------+
  10
+Wed Aug 25 20:09:14 BRT 2010
  11
+audacious-2.4.0-x86_64-1xinc.tgz
  12
++--------------------------+
  13
+Wed Aug 25 19:42:25 BRT 2010
  14
+podofo-0.8.2-x86_64-1xinc.tgz
  15
++--------------------------+
  16
+Wed Aug 25 19:17:39 BRT 2010
  17
+libsndfile-1.0.21-x86_64-2xinc.tgz
  18
++--------------------------+
  19
+Wed Aug 25 19:05:21 BRT 2010
  20
+game-music-emu-0.5.5-x86_64-2xinc.tgz
  21
++--------------------------+
  22
+Wed Aug 25 18:41:18 BRT 2010
  23
+mpd-0.16_alpha2-x86_64-1xinc.tgz
  24
++--------------------------+
  25
+Wed Aug 25 18:24:04 BRT 2010
  26
+mpc-0.19-x86_64-1xinc.tgz
  27
++--------------------------+
  28
+Wed Aug 25 18:17:07 BRT 2010
  29
+dstat-0.7.2-noarch-1xinc.tgz
  30
++--------------------------+
  31
+Wed Aug 25 18:11:38 BRT 2010
  32
+file-5.04-x86_64-5xinc.tgz
  33
++--------------------------+
  34
+Wed Aug 25 17:30:54 BRT 2010
  35
+squid-3.1.7-x86_64-1xinc.tgz
  36
++--------------------------+
  37
+Wed Aug 25 16:51:53 BRT 2010
  38
+mpdsetup-20100825-x86_64-1xinc.tgz
  39
++--------------------------+
  40
+Wed Aug 25 16:14:36 BRT 2010
  41
+python-mpd-twisted-20100825-x86_64-1xinc.tgz
  42
++--------------------------+
  43
+Wed Aug 25 15:54:06 BRT 2010
  44
+python-lepl-4.3.2-x86_64-1xinc.tgz
  45
++--------------------------+
  46
+Wed Aug 25 15:33:34 BRT 2010
  47
+python-mpd-0.2.1-x86_64-2xinc.tgz
  48
++--------------------------+
  49
+Wed Aug 25 14:26:04 BRT 2010
  50
+mpdscribble-0.19-x86_64-2xinc.tgz
  51
++--------------------------+
  52
+Wed Aug 25 12:10:19 BRT 2010
  53
+highlight-3.1-x86_64-1xinc.tgz
  54
++--------------------------+
  55
+Wed Aug 25 01:58:57 BRT 2010
  56
+system-config-printer-1.2.4-x86_64-1xinc.tgz
  57
++--------------------------+
  58
+Tue Aug 24 21:36:20 BRT 2010
  59
+mpd-0.15.12-x86_64-1xinc.tgz
  60
++--------------------------+
  61
+Tue Aug 24 20:42:25 BRT 2010
  62
+kde-servicemenu-pdf-0.4-noarch-1xinc.tgz
  63
++--------------------------+
  64
+Tue Aug 24 20:39:58 BRT 2010
  65
+feh-1.9-x86_64-1xinc.tgz
  66
++--------------------------+
  67
+Tue Aug 24 20:37:21 BRT 2010
  68
+klavaro-1.7.0-x86_64-1xinc.tgz
  69
++--------------------------+
  70
+Tue Aug 24 20:35:16 BRT 2010
  71
+xf86-video-nouveau-20100824-x86_64-1xinc.tgz
  72
++--------------------------+
  73
+Tue Aug 24 19:49:43 BRT 2010
  74
+tigervnc-20100824-x86_64-1xinc.tgz
  75
++--------------------------+
  76
+Tue Aug 24 19:45:26 BRT 2010
  77
+xorg-server-1.9.0-x86_64-1xinc.tgz
  78
++--------------------------+
  79
+Tue Aug 24 18:34:06 BRT 2010
  80
+ruby-1.9.2.p0-x86_64-1xinc.tgz
  81
++--------------------------+
  82
+Tue Aug 24 18:29:25 BRT 2010
  83
+libdbusmenu-qt-0.6.0-x86_64-1xinc.tgz
  84
++--------------------------+
  85
+Tue Aug 24 18:05:27 BRT 2010
  86
+john-1.7.6-x86_64-1xinc.tgz
  87
++--------------------------+
  88
+Tue Aug 24 12:47:41 BRT 2010
  89
+empathy-2.30.3-x86_64-1xinc.tgz
  90
++--------------------------+
  91
+Tue Aug 24 12:39:18 BRT 2010
  92
+scons-2.0.1-x86_64-1xinc.tgz
  93
++--------------------------+
  94
+Tue Aug 24 12:37:43 BRT 2010
  95
+pysmbc-1.0.9-x86_64-1xinc.tgz
  96
++--------------------------+
  97
+Tue Aug 24 12:36:31 BRT 2010
  98
+obexd-0.31-x86_64-1xinc.tgz
  99
++--------------------------+
  100
+Tue Aug 24 12:34:54 BRT 2010
  101
+gtk-nodoka-engine-0.7.5-x86_64-1xinc.tgz
  102
++--------------------------+
  103
+Tue Aug 24 12:28:30 BRT 2010
  104
+qbittorrent-2.4.0rc3-x86_64-1xinc.tgz
  105
++--------------------------+
  106
+Tue Aug 24 02:47:08 BRT 2010
  107
+sqlite-3.7.1-x86_64-1xinc.tgz
  108
++--------------------------+
1 109
 Mon Aug 23 22:14:48 BRT 2010
2 110
 openssh-5.6p1-x86_64-1xinc.tgz
3 111
 +--------------------------+
4  audacious-plugins/ChangeLog.SB
... ...
@@ -1,3 +1,7 @@
  1
+Wed Aug 25 20:10:09 BRT 2010
  2
+audacious-plugins-2.4.0-x86_64-1xinc.tgz:
  3
+Updated to 2.4.0.
  4
++--------------------------+
1 5
 Mon Aug 23 21:42:15 BRT 2010
2 6
 audacious-plugins-2.4.rc3-x86_64-1xinc.tgz:
3 7
 Updated to 2.4-rc3.
4  audacious-plugins/audacious-plugins.SlackBuild
@@ -43,7 +43,7 @@ fi
43 43
 NAME=audacious-plugins
44 44
 PKG=${PKG:-${TMP}/package-${NAME}}
45 45
 
46  
-VERSION=${VERSION:-2.4-rc3}
  46
+VERSION=${VERSION:-2.4.0}
47 47
 if [ "${SB_NATIVE}" = "YES" ] ;then
48 48
   ARCH=${ARCH:-$(uname -m)}
49 49
 else
@@ -123,6 +123,8 @@ do
123 123
 done
124 124
 grep -q -s __RPM_LIB * -R && exit 1
125 125
 
  126
+sed -i -e 's|${PLUGIN_CPPFLAGS}|\0 ${SNDFILE_CFLAGS}|g' src/sndfile/Makefile || exit 1
  127
+
126 128
 sed -i '\,^.SILENT:,d' buildsys.mk.in
127 129
 
128 130
 CFLAGS="${SLKCFLAGS}" \
4  audacious/ChangeLog.SB
... ...
@@ -1,3 +1,7 @@
  1
+Wed Aug 25 20:09:14 BRT 2010
  2
+audacious-2.4.0-x86_64-1xinc.tgz:
  3
+Updated to 2.4.0.
  4
++--------------------------+
1 5
 Mon Aug 23 21:40:09 BRT 2010
2 6
 audacious-2.4.rc3-x86_64-1xinc.tgz:
3 7
 Updated to 2.4-rc3.
2  audacious/audacious.SlackBuild
@@ -43,7 +43,7 @@ fi
43 43
 NAME=audacious
44 44
 PKG=${PKG:-${TMP}/package-${NAME}}
45 45
 
46  
-VERSION=${VERSION:-2.4-rc3}
  46
+VERSION=${VERSION:-2.4.0}
47 47
 if [ "${SB_NATIVE}" = "YES" ] ;then
48 48
   ARCH=${ARCH:-$(uname -m)}
49 49
 else
4  dstat/ChangeLog.SB
... ...
@@ -1,3 +1,7 @@
  1
+Wed Aug 25 18:17:07 BRT 2010
  2
+dstat-0.7.2-noarch-1xinc.tgz:
  3
+Updated to 0.7.2.
  4
++--------------------------+
1 5
 Thu Dec 24 16:40:18 BRST 2009
2 6
 dstat-0.7.0-noarch-1xinc.tgz:
3 7
 First SB.
10  dstat/apply-patches.sh
... ...
@@ -0,0 +1,10 @@
  1
+
  2
+set -e -o pipefail
  3
+
  4
+SB_PATCHDIR=${CWD}/patches
  5
+
  6
+# patch -p0 -E --backup --verbose -i ${SB_PATCHDIR}/${NAME}.patch
  7
+zcat ${SB_PATCHDIR}/dstat-0.6.8-dbus.patch.gz | patch -p1 -E --backup --verbose
  8
+patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/dstat-0.7.2-bits.patch
  9
+
  10
+set +e +o pipefail
17  dstat/dstat.SlackBuild
@@ -43,7 +43,7 @@ fi
43 43
 NAME=dstat
44 44
 PKG=${PKG:-${TMP}/package-${NAME}}
45 45
 
46  
-VERSION=${VERSION:-0.7.0}
  46
+VERSION=${VERSION:-0.7.2}
47 47
 ARCH=noarch
48 48
 SLKTARGET=${SLKTARGET:-i486}
49 49
 SLKDTARGET=${SLKDTARGET:-slackware}
@@ -81,8 +81,9 @@ cd ${SRCDIR} || exit 1
81 81
 
82 82
 chmod -R u+w,go+r-w,a-s .
83 83
 
84  
-# zcat ${CWD}/${NAME}.patch.gz | patch -p0 -E --backup --verbose || exit 1
85  
-zcat ${CWD}/${NAME}-0.6.8-dbus.patch.gz | patch -p1 -E --backup --verbose || exit 1
  84
+if [ -r ${CWD}/apply-patches.sh ]; then
  85
+  . ${CWD}/apply-patches.sh || exit 1
  86
+fi
86 87
 
87 88
 sed -i 's/\r//' docs/*.html
88 89
 rm -rf examples/dstat.py
@@ -96,10 +97,12 @@ chmod a+x ${PKG}/usr/share/dstat/dstat.py
96 97
 # Add a documentation directory:
97 98
 mkdir -p ${DOCDIR}
98 99
 cp -a \
99  
-  AUTHORS ChangeLog COPYING README TODO docs/*.{html,txt} examples/ \
  100
+  AUTHORS COPYING README TODO docs/*.{html,txt} examples/ \
100 101
   ${CWD}/ChangeLog.SB ${DOCDIR}/
  102
+[ -r ChangeLog ] && head -n 1000 ChangeLog > ${DOCDIR}/ChangeLog
101 103
 find ${DOCDIR}/ -type d -print0 | xargs -0 chmod 0755
102 104
 find ${DOCDIR}/ -type f -print0 | xargs -0 chmod 0644
  105
+find ${DOCDIR}/ -type f -size 0 -print0 | xargs -0 rm -f
103 106
 
104 107
 # Compress and link manpages, if any:
105 108
 if [ -d ${PKG}/usr/share/man ]; then
@@ -131,11 +134,13 @@ sed -i "s|_PACKAGER|${PACKAGER}|g; s|_BUILD_DATE|${DATE}|g" \
131 134
 
132 135
 if [ "${SB_REP}" = "YES" ] ;then
133 136
   # Replicate slackbuild and patches
134  
-  mkdir -p ${SBDIR}
  137
+  mkdir -p ${SBDIR}/patches
135 138
   install -m0644 ${CWD}/slack-desc ${CWD}/slack-required ${CWD}/ChangeLog.SB \
136  
-                 ${CWD}/${NAME}-*.patch.gz ${SBDIR}/
  139
+                 ${CWD}/apply-patches.sh ${SBDIR}/
137 140
   install -m0755 ${CWD}/${NAME}.SlackBuild \
138 141
                  ${SBDIR}/${NAME}.SlackBuild
  142
+  install -m0644 ${CWD}/patches/*.* \
  143
+                 ${SBDIR}/patches/
139 144
 fi
140 145
 
141 146
 # Build package:
0  dstat/dstat-0.6.8-dbus.patch.gz → dstat/patches/dstat-0.6.8-dbus.patch.gz
File renamed without changes
106  dstat/patches/dstat-0.7.2-bits.patch
... ...
@@ -0,0 +1,106 @@
  1
+--- dstat-0.7.2/dstat.orig	2010-06-11 08:08:01.000000000 +0200
  2
++++ dstat-0.7.2/dstat	2010-08-24 09:50:39.000000000 +0200
  3
+@@ -90,6 +90,8 @@ class Options:
  4
+         self.output = False
  5
+         self.pidfile = False
  6
+         self.profile = ''
  7
++        self.netbits = False
  8
++        self.diskbits = False
  9
+ 
  10
+         ### List of available plugins
  11
+         allplugins = listplugins()
  12
+@@ -111,9 +113,9 @@ class Options:
  13
+         }
  14
+ 
  15
+         try:
  16
+-            opts, args = getopt.getopt(args, 'acdfghilmno:prstTvyC:D:I:M:N:S:V',
  17
+-                ['all', 'all-plugins', 'bw', 'blackonwhite', 'debug',
  18
+-                 'filesystem', 'float', 'full', 'help', 'integer',
  19
++            opts, args = getopt.getopt(args, 'abcdfghilmno:prstTvyC:D:I:M:N:S:V',
  20
++                ['all', 'all-plugins', 'bw', 'bits', 'blackonwhite', 'debug',
  21
++                 'filesystem', 'float', 'full', 'help', 'integer', 'netbits', 'diskbits'
  22
+                  'list', 'mods', 'modules', 'nocolor', 'noheaders', 'noupdate',
  23
+                  'output=', 'pidfile=', 'profile', 'version', 'vmstat'] + allplugins)
  24
+         except getopt.error, exc:
  25
+@@ -179,6 +181,13 @@ class Options:
  26
+                 self.blackonwhite = True
  27
+             elif opt in ['--debug']:
  28
+                 self.debug = self.debug + 1
  29
++            elif opt in ['--bits', '-b']:
  30
++                self.netbits = True
  31
++                self.diskbits = True
  32
++            elif opt in ['--netbits']:
  33
++                self.netbits = True
  34
++            elif opt in ['--diskbits']:
  35
++                self.diskbits = True
  36
+             elif opt in ['--float']:
  37
+                 self.float = True
  38
+             elif opt in ['--integer']:
  39
+@@ -268,9 +277,11 @@ Dstat options:
  40
+      -C 0,3,total           include cpu0, cpu3 and total
  41
+   -d, --disk             enable disk stats
  42
+      -D total,hda           include hda and total
  43
++     --diskbits             output disk stats in bits instead of bytes
  44
+   -g, --page             enable page stats
  45
+   -i, --int              enable interrupt stats
  46
+      -I 5,eth2              include int5 and interrupt used by eth2
  47
++     --netbits              output net stats in bits instead of bytes
  48
+   -l, --load             enable load stats
  49
+   -m, --mem              enable memory stats
  50
+   -n, --net              enable network stats
  51
+@@ -282,6 +293,7 @@ Dstat options:
  52
+   -t, --time             enable time/date output
  53
+   -T, --epoch            enable time counter (seconds since epoch)
  54
+   -y, --sys              enable system stats
  55
++  -b, --bits             output disk/net stats in bits instead of bytes
  56
+ 
  57
+   --aio                  enable aio stats
  58
+   --fs, --filesystem     enable fs stats
  59
+@@ -719,6 +731,12 @@ class dstat_disk(dstat):
  60
+         return ['dsk/'+sysfs_dev(name) for name in self.vars]
  61
+ 
  62
+     def extract(self):
  63
++
  64
++        # Default to 1.0 (leave as bytes) but if bits convert the bytes to bits
  65
++        factor = 1.0
  66
++        if op.diskbits:
  67
++		      factor = 8.0
  68
++
  69
+         for name in self.vars: self.set2[name] = (0, 0)
  70
+         for l in self.splitlines():
  71
+             if len(l) < 13: continue
  72
+@@ -736,8 +754,8 @@ class dstat_disk(dstat):
  73
+                             self.set2[diskset] = ( self.set2[diskset][0] + long(l[5]), self.set2[diskset][1] + long(l[9]) )
  74
+         for name in self.set2.keys():
  75
+             self.val[name] = (
  76
+-                (self.set2[name][0] - self.set1[name][0]) * 512.0 / elapsed,
  77
+-                (self.set2[name][1] - self.set1[name][1]) * 512.0 / elapsed,
  78
++                (self.set2[name][0] - self.set1[name][0]) * factor * 512.0 / elapsed,
  79
++                (self.set2[name][1] - self.set1[name][1]) * factor * 512.0 / elapsed,
  80
+             )
  81
+         if step == op.delay:
  82
+             self.set1.update(self.set2)
  83
+@@ -1227,6 +1245,12 @@ class dstat_net(dstat):
  84
+ 
  85
+     def extract(self):
  86
+         self.set2['total'] = [0, 0]
  87
++
  88
++        # Default to 1.0 (leave as bytes) but if bits convert the bytes to bits
  89
++        factor = 1.0
  90
++        if op.netbits:
  91
++            factor = 8.0
  92
++
  93
+         for l in self.splitlines(replace=':'):
  94
+             if len(l) < 17: continue
  95
+             if l[2] == '0' and l[10] == '0': continue
  96
+@@ -1238,8 +1262,8 @@ class dstat_net(dstat):
  97
+         if update:
  98
+             for name in self.set2.keys():
  99
+                 self.val[name] = [
  100
+-                    (self.set2[name][0] - self.set1[name][0]) * 1.0 / elapsed,
  101
+-                    (self.set2[name][1] - self.set1[name][1]) * 1.0 / elapsed,
  102
++                    (self.set2[name][0] - self.set1[name][0]) * factor / elapsed,
  103
++                    (self.set2[name][1] - self.set1[name][1]) * factor / elapsed,
  104
+                 ]
  105
+                 if self.val[name][0] < 0: self.val[name][0] += maxint + 1
  106
+                 if self.val[name][1] < 0: self.val[name][1] += maxint + 1
4  feh/ChangeLog.SB
... ...
@@ -1,3 +1,7 @@
  1
+Tue Aug 24 20:39:58 BRT 2010
  2
+feh-1.9-x86_64-1xinc.tgz:
  3
+Updated to 1.9.
  4
++--------------------------+
1 5
 Sun Jun 27 01:16:45 BRT 2010
2 6
 feh-1.8-x86_64-1xinc.tgz:
3 7
 Updated to 1.8.
2  feh/feh.SlackBuild
@@ -44,7 +44,7 @@ fi
44 44
 NAME=feh
45 45
 PKG=${PKG:-${TMP}/package-${NAME}}
46 46
 
47  
-VERSION=${VERSION:-1.8}
  47
+VERSION=${VERSION:-1.9}
48 48
 if [ "${SB_NATIVE}" = "YES" ] ;then
49 49
   ARCH=${ARCH:-$(uname -m)}
50 50
 else
4  file/ChangeLog.SB
... ...
@@ -1,3 +1,7 @@
  1
+Wed Aug 25 18:11:38 BRT 2010
  2
+file-5.04-x86_64-5xinc.tgz:
  3
+Rebuilt.
  4
++--------------------------+
1 5
 Fri Aug 13 19:11:30 BRT 2010
2 6
 file-5.04-x86_64-4xinc.tgz:
3 7
 Rebuilt.
1  file/apply-patches.sh
@@ -26,6 +26,7 @@ patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/file-5.04-html-regression.patc
26 26
 patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/file-5.04-zmachine-magic-update.patch
27 27
 patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/file-5.04-core-prpsinfo.patch
28 28
 patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/file-5.04-python-2.7.patch
  29
+patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/file-5.04-webm.patch
29 30
 
30 31
 # Mandriva
31 32
 zcat ${SB_PATCHDIR}/file-4.24-selinux.patch.gz | patch -p1 -E --backup --verbose
2  file/file.SlackBuild
@@ -56,7 +56,7 @@ else
56 56
   SLKTARGET=${SLKTARGET:-i486}
57 57
 fi
58 58
 SLKDTARGET=${SLKDTARGET:-slackware}
59  
-BUILD=${BUILD:-4}
  59
+BUILD=${BUILD:-5}
60 60
 NJOBS=${NJOBS:-$(( $(getconf _NPROCESSORS_ONLN) + 1 ))}
61 61
 DOCDIR=${PKG}/usr/doc/${NAME}-${VERSION}
62 62
 DOCDIR2=${PKG}/usr/doc/python-magic-${VERSION}
16  file/patches/file-5.04-webm.patch
... ...
@@ -0,0 +1,16 @@
  1
+diff --git a/magic/Magdir/matroska b/magic/Magdir/matroska
  2
+index 0ede715..d3d7349 100644
  3
+--- a/magic/Magdir/matroska
  4
++++ b/magic/Magdir/matroska
  5
+@@ -13,3 +13,11 @@
  6
+ # DocType contents:
  7
+ >>8		string		matroska	Matroska data
  8
+ !:mime  video/x-matroska
  9
++
  10
++# EBML id:
  11
++0		belong		0x1a45dfa3
  12
++# DocType id:
  13
++>0		search/4096 	\x42\x82
  14
++# DocType contents:
  15
++>>&1		string		webm	WebM
  16
++!:mime  video/webm
4  game-music-emu/ChangeLog.SB
... ...
@@ -1,3 +1,7 @@
  1
+Wed Aug 25 19:05:21 BRT 2010
  2
+game-music-emu-0.5.5-x86_64-2xinc.tgz:
  3
+Rebuilt.
  4
++--------------------------+
1 5
 Mon May 10 17:28:56 BRT 2010
2 6
 game-music-emu-0.5.5-x86_64-1xinc.tgz:
3 7
 First SB.
2  game-music-emu/apply-patches.sh
@@ -3,6 +3,8 @@ set -e -o pipefail
3 3
 
4 4
 SB_PATCHDIR=${CWD}/patches
5 5
 
  6
+# patch -p0 -E --backup --verbose -i ${SB_PATCHDIR}/${NAME}.patch
6 7
 patch -p0 -E --backup -z .libsuffix --verbose -i ${SB_PATCHDIR}/${NAME}-0.5.5-libsuffix.patch
  8
+patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/01_symbol-exports.patch
7 9
 
8 10
 set +e +o pipefail
18  game-music-emu/game-music-emu.SlackBuild
@@ -55,7 +55,7 @@ else
55 55
   SLKTARGET=${SLKTARGET:-i486}
56 56
 fi
57 57
 SLKDTARGET=${SLKDTARGET:-slackware}
58  
-BUILD=${BUILD:-1}
  58
+BUILD=${BUILD:-2}
59 59
 NJOBS=${NJOBS:-$(( $(getconf _NPROCESSORS_ONLN) + 1 ))}
60 60
 DOCDIR=${PKG}/usr/doc/${NAME}-${VERSION}
61 61
 SBDIR=${PKG}/usr/src/slackbuilds/${NAME}
@@ -108,7 +108,6 @@ cd ${SRCDIR} || exit 1
108 108
 
109 109
 chmod -R u+w,go+r-w,a-s .
110 110
 
111  
-# zcat ${CWD}/${NAME}.patch.gz | patch -p0 -E --backup --verbose || exit 1
112 111
 if [ -r ${CWD}/apply-patches.sh ]; then
113 112
   . ${CWD}/apply-patches.sh || exit 1
114 113
 fi
@@ -144,6 +143,21 @@ mkdir -p build
144 143
 find ${PKG} | xargs file | grep -e "executable" -e "shared object" | grep ELF \
145 144
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
146 145
 
  146
+mkdir -p ${PKG}/usr/lib${LIBDIRSUFFIX}/pkgconfig
  147
+cat > ${PKG}/usr/lib${LIBDIRSUFFIX}/pkgconfig/libgme.pc <<EOF
  148
+prefix=/usr
  149
+exec_prefix=\${prefix}
  150
+libdir=\${exec_prefix}/lib${LIBDIRSUFFIX}
  151
+includedir=\${prefix}/include
  152
+
  153
+Name: mad
  154
+Description: Video game music file emulation/playback library
  155
+Requires:
  156
+Version: ${VERSION}
  157
+Libs: -L\${libdir} -lgme
  158
+Cflags: -I\${includedir}
  159
+EOF
  160
+
147 161
 # Add a documentation directory:
148 162
 mkdir -p ${DOCDIR}
149 163
 cp -a \
491  game-music-emu/patches/01_symbol-exports.patch
... ...
@@ -0,0 +1,491 @@
  1
+diff -Naur game-music-emu-0.5.5.old/CMakeLists.txt game-music-emu-0.5.5/CMakeLists.txt
  2
+--- game-music-emu-0.5.5.old/CMakeLists.txt	2009-07-13 06:53:08.000000000 +0200
  3
++++ game-music-emu-0.5.5/CMakeLists.txt	2010-03-22 14:25:40.427519453 +0100
  4
+@@ -1,6 +1,10 @@
  5
+ # CMake project definition file.
  6
+ project(libgme)
  7
+ 
  8
++include (CheckCXXCompilerFlag)
  9
++ 
  10
++set(GME_VERSION 0.5.5 CACHE INTERNAL "libgme Version")
  11
++
  12
+ # 2.6+ always assumes FATAL_ERROR, but 2.4 and below don't.
  13
+ # Of course, 2.4 might work, in which case you're welcome to drop
  14
+ # down the requirement, but I can't test that.
  15
+@@ -52,6 +56,33 @@
  16
+     SET(USE_GME_NSF 1 CACHE BOOL "Enable NES NSF music emulation" FORCE)
  17
+ endif()
  18
+ 
  19
++# Check for GCC "visibility" support.
  20
++if (CMAKE_COMPILER_IS_GNUCXX)
  21
++   check_cxx_compiler_flag (-fvisibility=hidden __LIBGME_TEST_VISIBILITY)
  22
++   set (ENABLE_VISIBILITY OFF)
  23
++   if (__LIBGME_TEST_VISIBILITY)
  24
++      # get the gcc version
  25
++      exec_program(${CMAKE_CXX_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info)
  26
++      string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
  27
++
  28
++      # gcc <4.1 had poor support for symbol visibility
  29
++      if ((${_gcc_version} VERSION_GREATER "4.1") OR (${_gcc_version} VERSION_EQUAL "4.1"))
  30
++         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
  31
++         set (ENABLE_VISIBILITY ON)
  32
++         add_definitions (-DLIBGME_VISIBILITY)
  33
++
  34
++         # GCC >= 4.2 also correctly supports making inline members have hidden
  35
++         # visibility by default.
  36
++         if ((${_gcc_version} VERSION_GREATER "4.2") OR (${_gcc_version} VERSION_EQUAL "4.2"))
  37
++            set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
  38
++         endif()
  39
++      endif()
  40
++   endif() # test visibility
  41
++endif (CMAKE_COMPILER_IS_GNUCXX)
  42
++
  43
++# Cache this result
  44
++set( LIBGME_HAVE_GCC_VISIBILITY ${ENABLE_VISIBILITY} CACHE BOOL "GCC support for hidden visibility")
  45
++
  46
+ # Shared library defined here
  47
+ add_subdirectory(gme)
  48
+ 
  49
+diff -Naur game-music-emu-0.5.5.old/gme/blargg_source.h game-music-emu-0.5.5/gme/blargg_source.h
  50
+--- game-music-emu-0.5.5.old/gme/blargg_source.h	2009-06-24 04:21:29.000000000 +0200
  51
++++ game-music-emu-0.5.5/gme/blargg_source.h	2010-03-22 14:24:56.280934821 +0100
  52
+@@ -66,6 +66,17 @@
  53
+ #define byte byte_
  54
+ typedef unsigned char byte;
  55
+ 
  56
++// Setup compiler defines useful for exporting required public API symbols in gme.cpp
  57
++#ifndef BLARGG_EXPORT
  58
++    #if defined (_WIN32) && defined(BLARGG_BUILD_DLL)
  59
++        #define BLARGG_EXPORT __declspec(dllexport)
  60
++    #elif defined (LIBGME_VISIBILITY)
  61
++        #define BLARGG_EXPORT __attribute__((visibility ("default")))
  62
++    #else
  63
++        #define BLARGG_EXPORT
  64
++    #endif
  65
++#endif
  66
++
  67
+ // deprecated
  68
+ #define BLARGG_CHECK_ALLOC CHECK_ALLOC
  69
+ #define BLARGG_RETURN_ERR RETURN_ERR
  70
+diff -Naur game-music-emu-0.5.5.old/gme/CMakeLists.txt game-music-emu-0.5.5/gme/CMakeLists.txt
  71
+--- game-music-emu-0.5.5.old/gme/CMakeLists.txt	2009-07-13 06:53:08.000000000 +0200
  72
++++ game-music-emu-0.5.5/gme/CMakeLists.txt	2010-03-22 14:24:56.276931030 +0100
  73
+@@ -144,6 +144,11 @@
  74
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/gme_types.h.in
  75
+     ${CMAKE_CURRENT_BINARY_DIR}/gme_types.h)
  76
+ 
  77
++# On some platforms we may need to change headers or whatnot based on whether
  78
++# we're building the library or merely using the library. The following is
  79
++# only defined when building the library to allow us to tell which is which.
  80
++add_definitions(-DBLARGG_BUILD_DLL)
  81
++
  82
+ # For the gme_types.h
  83
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
  84
+ 
  85
+diff -Naur game-music-emu-0.5.5.old/gme/gme.cpp game-music-emu-0.5.5/gme/gme.cpp
  86
+--- game-music-emu-0.5.5.old/gme/gme.cpp	2009-07-27 06:14:46.000000000 +0200
  87
++++ game-music-emu-0.5.5/gme/gme.cpp	2010-03-22 14:27:34.676925694 +0100
  88
+@@ -22,7 +22,7 @@
  89
+ 
  90
+ #include "blargg_source.h"
  91
+ 
  92
+-gme_type_t const* gme_type_list()
  93
++BLARGG_EXPORT gme_type_t const* gme_type_list()
  94
+ {
  95
+ 	static gme_type_t const gme_type_list_ [] = {
  96
+ #ifdef USE_GME_AY
  97
+@@ -61,7 +61,7 @@
  98
+ 	return gme_type_list_;
  99
+ }
  100
+ 
  101
+-const char* gme_identify_header( void const* header )
  102
++BLARGG_EXPORT const char* gme_identify_header( void const* header )
  103
+ {
  104
+ 	switch ( get_be32( header ) )
  105
+ 	{
  106
+@@ -90,7 +90,7 @@
  107
+ 	*out = 0; // extension too long
  108
+ }
  109
+ 
  110
+-gme_type_t gme_identify_extension( const char* extension_ )
  111
++BLARGG_EXPORT gme_type_t gme_identify_extension( const char* extension_ )
  112
+ {
  113
+ 	char const* end = strrchr( extension_, '.' );
  114
+ 	if ( end )
  115
+@@ -105,7 +105,7 @@
  116
+ 	return 0;
  117
+ }
  118
+ 
  119
+-gme_err_t gme_identify_file( const char* path, gme_type_t* type_out )
  120
++BLARGG_EXPORT gme_err_t gme_identify_file( const char* path, gme_type_t* type_out )
  121
+ {
  122
+ 	*type_out = gme_identify_extension( path );
  123
+ 	// TODO: don't examine header if file has extension?
  124
+@@ -120,7 +120,7 @@
  125
+ 	return 0;   
  126
+ }
  127
+ 
  128
+-gme_err_t gme_open_data( void const* data, long size, Music_Emu** out, int sample_rate )
  129
++BLARGG_EXPORT gme_err_t gme_open_data( void const* data, long size, Music_Emu** out, int sample_rate )
  130
+ {
  131
+ 	require( (data || !size) && out );
  132
+ 	*out = 0;
  133
+@@ -144,7 +144,7 @@
  134
+ 	return err;
  135
+ }
  136
+ 
  137
+-gme_err_t gme_open_file( const char* path, Music_Emu** out, int sample_rate )
  138
++BLARGG_EXPORT gme_err_t gme_open_file( const char* path, Music_Emu** out, int sample_rate )
  139
+ {
  140
+ 	require( path && out );
  141
+ 	*out = 0;
  142
+@@ -181,7 +181,7 @@
  143
+ 	return err;
  144
+ }
  145
+ 
  146
+-Music_Emu* gme_new_emu( gme_type_t type, int rate )
  147
++BLARGG_EXPORT Music_Emu* gme_new_emu( gme_type_t type, int rate )
  148
+ {
  149
+ 	if ( type )
  150
+ 	{
  151
+@@ -214,27 +214,27 @@
  152
+ 	return 0;
  153
+ }
  154
+ 
  155
+-gme_err_t gme_load_file( Music_Emu* me, const char* path ) { return me->load_file( path ); }
  156
++BLARGG_EXPORT gme_err_t gme_load_file( Music_Emu* me, const char* path ) { return me->load_file( path ); }
  157
+ 
  158
+-gme_err_t gme_load_data( Music_Emu* me, void const* data, long size )
  159
++BLARGG_EXPORT gme_err_t gme_load_data( Music_Emu* me, void const* data, long size )
  160
+ {
  161
+ 	Mem_File_Reader in( data, size );
  162
+ 	return me->load( in );
  163
+ }
  164
+ 
  165
+-gme_err_t gme_load_custom( Music_Emu* me, gme_reader_t func, long size, void* data )
  166
++BLARGG_EXPORT gme_err_t gme_load_custom( Music_Emu* me, gme_reader_t func, long size, void* data )
  167
+ {
  168
+ 	Callback_Reader in( func, size, data );
  169
+ 	return me->load( in );
  170
+ }
  171
+ 
  172
+-void gme_delete( Music_Emu* me ) { delete me; }
  173
++BLARGG_EXPORT void gme_delete( Music_Emu* me ) { delete me; }
  174
+ 
  175
+-gme_type_t gme_type( Music_Emu const* me ) { return me->type(); }
  176
++BLARGG_EXPORT gme_type_t gme_type( Music_Emu const* me ) { return me->type(); }
  177
+ 
  178
+-const char* gme_warning( Music_Emu* me ) { return me->warning(); }
  179
++BLARGG_EXPORT const char* gme_warning( Music_Emu* me ) { return me->warning(); }
  180
+ 
  181
+-int gme_track_count( Music_Emu const* me ) { return me->track_count(); }
  182
++BLARGG_EXPORT int gme_track_count( Music_Emu const* me ) { return me->track_count(); }
  183
+ 
  184
+ struct gme_info_t_ : gme_info_t
  185
+ {
  186
+@@ -243,7 +243,7 @@
  187
+ 	BLARGG_DISABLE_NOTHROW
  188
+ };
  189
+ 
  190
+-gme_err_t gme_track_info( Music_Emu const* me, gme_info_t** out, int track )
  191
++BLARGG_EXPORT gme_err_t gme_track_info( Music_Emu const* me, gme_info_t** out, int track )
  192
+ {
  193
+ 	*out = NULL;
  194
+ 	
  195
+@@ -309,12 +309,12 @@
  196
+ 	return 0;
  197
+ }
  198
+ 
  199
+-void gme_free_info( gme_info_t* info )
  200
++BLARGG_EXPORT void gme_free_info( gme_info_t* info )
  201
+ {
  202
+ 	delete STATIC_CAST(gme_info_t_*,info);
  203
+ }
  204
+ 
  205
+-void gme_set_stereo_depth( Music_Emu* me, double depth )
  206
++BLARGG_EXPORT void gme_set_stereo_depth( Music_Emu* me, double depth )
  207
+ {
  208
+ #if !GME_DISABLE_STEREO_DEPTH
  209
+ 	if ( me->effects_buffer )
  210
+@@ -322,23 +322,23 @@
  211
+ #endif
  212
+ }
  213
+ 
  214
+-void*     gme_user_data      ( Music_Emu const* me )                { return me->user_data(); }
  215
+-void      gme_set_user_data  ( Music_Emu* me, void* new_user_data ) { me->set_user_data( new_user_data ); }
  216
+-void      gme_set_user_cleanup(Music_Emu* me, gme_user_cleanup_t func ) { me->set_user_cleanup( func ); }
  217
+-
  218
+-gme_err_t gme_start_track    ( Music_Emu* me, int index )           { return me->start_track( index ); }
  219
+-gme_err_t gme_play           ( Music_Emu* me, int n, short* p )     { return me->play( n, p ); }
  220
+-void      gme_set_fade       ( Music_Emu* me, int start_msec )      { me->set_fade( start_msec ); }
  221
+-int       gme_track_ended    ( Music_Emu const* me )                { return me->track_ended(); }
  222
+-int       gme_tell           ( Music_Emu const* me )                { return me->tell(); }
  223
+-gme_err_t gme_seek           ( Music_Emu* me, int msec )            { return me->seek( msec ); }
  224
+-int       gme_voice_count    ( Music_Emu const* me )                { return me->voice_count(); }
  225
+-void      gme_ignore_silence ( Music_Emu* me, int disable )         { me->ignore_silence( disable != 0 ); }
  226
+-void      gme_set_tempo      ( Music_Emu* me, double t )            { me->set_tempo( t ); }
  227
+-void      gme_mute_voice     ( Music_Emu* me, int index, int mute ) { me->mute_voice( index, mute != 0 ); }
  228
+-void      gme_mute_voices    ( Music_Emu* me, int mask )            { me->mute_voices( mask ); }
  229
++BLARGG_EXPORT void*     gme_user_data      ( Music_Emu const* me )                { return me->user_data(); }
  230
++BLARGG_EXPORT void      gme_set_user_data  ( Music_Emu* me, void* new_user_data ) { me->set_user_data( new_user_data ); }
  231
++BLARGG_EXPORT void      gme_set_user_cleanup(Music_Emu* me, gme_user_cleanup_t func ) { me->set_user_cleanup( func ); }
  232
++
  233
++BLARGG_EXPORT gme_err_t gme_start_track    ( Music_Emu* me, int index )           { return me->start_track( index ); }
  234
++BLARGG_EXPORT gme_err_t gme_play           ( Music_Emu* me, int n, short* p )     { return me->play( n, p ); }
  235
++BLARGG_EXPORT void      gme_set_fade       ( Music_Emu* me, int start_msec )      { me->set_fade( start_msec ); }
  236
++BLARGG_EXPORT int       gme_track_ended    ( Music_Emu const* me )                { return me->track_ended(); }
  237
++BLARGG_EXPORT int       gme_tell           ( Music_Emu const* me )                { return me->tell(); }
  238
++BLARGG_EXPORT gme_err_t gme_seek           ( Music_Emu* me, int msec )            { return me->seek( msec ); }
  239
++BLARGG_EXPORT int       gme_voice_count    ( Music_Emu const* me )                { return me->voice_count(); }
  240
++BLARGG_EXPORT void      gme_ignore_silence ( Music_Emu* me, int disable )         { me->ignore_silence( disable != 0 ); }
  241
++BLARGG_EXPORT void      gme_set_tempo      ( Music_Emu* me, double t )            { me->set_tempo( t ); }
  242
++BLARGG_EXPORT void      gme_mute_voice     ( Music_Emu* me, int index, int mute ) { me->mute_voice( index, mute != 0 ); }
  243
++BLARGG_EXPORT void      gme_mute_voices    ( Music_Emu* me, int mask )            { me->mute_voices( mask ); }
  244
+ 
  245
+-void      gme_set_equalizer  ( Music_Emu* me, gme_equalizer_t const* eq )
  246
++BLARGG_EXPORT void      gme_set_equalizer  ( Music_Emu* me, gme_equalizer_t const* eq )
  247
+ {
  248
+ 	Music_Emu::equalizer_t e = me->equalizer();
  249
+ 	e.treble = eq->treble;
  250
+@@ -346,7 +346,7 @@
  251
+ 	me->set_equalizer( e );
  252
+ }
  253
+ 
  254
+-void gme_equalizer( Music_Emu const* me, gme_equalizer_t* out )
  255
++BLARGG_EXPORT void gme_equalizer( Music_Emu const* me, gme_equalizer_t* out )
  256
+ {
  257
+ 	gme_equalizer_t e = { };
  258
+ 	e.treble = me->equalizer().treble;
  259
+@@ -354,13 +354,13 @@
  260
+ 	*out = e;
  261
+ }
  262
+ 
  263
+-const char* gme_voice_name( Music_Emu const* me, int i )
  264
++BLARGG_EXPORT const char* gme_voice_name( Music_Emu const* me, int i )
  265
+ {
  266
+ 	assert( (unsigned) i < (unsigned) me->voice_count() );
  267
+ 	return me->voice_names() [i];
  268
+ }
  269
+ 
  270
+-const char* gme_type_system( gme_type_t type )
  271
++BLARGG_EXPORT const char* gme_type_system( gme_type_t type )
  272
+ {
  273
+ 	assert( type );
  274
+ 	return type->system;
  275
+diff -Naur game-music-emu-0.5.5.old/gme/M3u_Playlist.cpp game-music-emu-0.5.5/gme/M3u_Playlist.cpp
  276
+--- game-music-emu-0.5.5.old/gme/M3u_Playlist.cpp	2009-07-27 06:14:46.000000000 +0200
  277
++++ game-music-emu-0.5.5/gme/M3u_Playlist.cpp	2010-03-22 14:24:56.276931030 +0100
  278
+@@ -52,9 +52,9 @@
  279
+ 
  280
+ blargg_err_t Gme_File::load_m3u( Data_Reader& in )  { return load_m3u_( playlist.load( in ) ); }
  281
+ 
  282
+-gme_err_t gme_load_m3u( Music_Emu* me, const char* path ) { return me->load_m3u( path ); }
  283
++BLARGG_EXPORT gme_err_t gme_load_m3u( Music_Emu* me, const char* path ) { return me->load_m3u( path ); }
  284
+ 
  285
+-gme_err_t gme_load_m3u_data( Music_Emu* me, const void* data, long size )
  286
++BLARGG_EXPORT gme_err_t gme_load_m3u_data( Music_Emu* me, const void* data, long size )
  287
+ {
  288
+ 	Mem_File_Reader in( data, size );
  289
+ 	return me->load_m3u( in );
  290
+diff -Naur game-music-emu-0.5.5.old/player/Music_Player.cpp game-music-emu-0.5.5/player/Music_Player.cpp
  291
+--- game-music-emu-0.5.5.old/player/Music_Player.cpp	2009-07-27 06:14:46.000000000 +0200
  292
++++ game-music-emu-0.5.5/player/Music_Player.cpp	2010-03-22 14:24:56.280934821 +0100
  293
+@@ -2,12 +2,10 @@
  294
+ 
  295
+ #include "Music_Player.h"
  296
+ 
  297
+-#include "gme/Music_Emu.h"
  298
+-
  299
+ #include <string.h>
  300
+ #include <ctype.h>
  301
+ 
  302
+-/* Copyright (C) 2005-2006 by Shay Green. Permission is hereby granted, free of
  303
++/* Copyright (C) 2005-2010 by Shay Green. Permission is hereby granted, free of
  304
+ charge, to any person obtaining a copy of this software module and associated
  305
+ documentation files (the "Software"), to deal in the Software without
  306
+ restriction, including without limitation the rights to use, copy, modify,
  307
+@@ -22,7 +20,12 @@
  308
+ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  309
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
  310
+ 
  311
+-#include "blargg_source.h"
  312
++#define RETURN_ERR( expr ) \
  313
++	do {\
  314
++		gme_err_t err_ = (expr);\
  315
++		if ( err_ )\
  316
++			return err_;\
  317
++	} while ( 0 )
  318
+ 
  319
+ // Number of audio buffers per second. Adjust if you encounter audio skipping.
  320
+ const int fill_rate = 45;
  321
+@@ -36,12 +39,13 @@
  322
+ 
  323
+ Music_Player::Music_Player()
  324
+ {
  325
+-	emu_      = 0;
  326
+-	scope_buf = 0;
  327
+-	paused    = false;
  328
++	emu_        = 0;
  329
++	scope_buf   = 0;
  330
++	paused      = false;
  331
++	track_info_ = NULL;
  332
+ }
  333
+ 
  334
+-blargg_err_t Music_Player::init( long rate )
  335
++gme_err_t Music_Player::init( long rate )
  336
+ {
  337
+ 	sample_rate = rate;
  338
+ 	
  339
+@@ -56,17 +60,18 @@
  340
+ void Music_Player::stop()
  341
+ {
  342
+ 	sound_stop();
  343
+-	delete emu_;
  344
+-	emu_ = 0;
  345
++	gme_delete( emu_ );
  346
++	emu_ = NULL;
  347
+ }
  348
+ 
  349
+ Music_Player::~Music_Player()
  350
+ {
  351
+ 	stop();
  352
+ 	sound_cleanup();
  353
++	gme_free_info( track_info_ );
  354
+ }
  355
+ 
  356
+-blargg_err_t Music_Player::load_file( const char* path )
  357
++gme_err_t Music_Player::load_file( const char* path )
  358
+ {
  359
+ 	stop();
  360
+ 	
  361
+@@ -79,34 +84,36 @@
  362
+ 	if ( !p )
  363
+ 		p = m3u_path + strlen( m3u_path );
  364
+ 	strcpy( p, ".m3u" );
  365
+-	if ( emu_->load_m3u( m3u_path ) ) { } // ignore error
  366
++	if ( gme_load_m3u( emu_, m3u_path ) ) { } // ignore error
  367
+ 	
  368
+ 	return 0;
  369
+ }
  370
+ 
  371
+ int Music_Player::track_count() const
  372
+ {
  373
+-	return emu_ ? emu_->track_count() : false;
  374
++	return emu_ ? gme_track_count( emu_ ) : false;
  375
+ }
  376
+ 
  377
+-blargg_err_t Music_Player::start_track( int track )
  378
++gme_err_t Music_Player::start_track( int track )
  379
+ {
  380
+ 	if ( emu_ )
  381
+ 	{
  382
++		gme_free_info( track_info_ );
  383
++		track_info_ = NULL;
  384
++		RETURN_ERR( gme_track_info( emu_, &track_info_, track ) );
  385
++	
  386
+ 		// Sound must not be running when operating on emulator
  387
+ 		sound_stop();
  388
+-		RETURN_ERR( emu_->start_track( track ) );
  389
++		RETURN_ERR( gme_start_track( emu_, track ) );
  390
+ 		
  391
+ 		// Calculate track length
  392
+-		if ( !emu_->track_info( &track_info_ ) )
  393
+-		{
  394
+-			if ( track_info_.length <= 0 )
  395
+-				track_info_.length = track_info_.intro_length +
  396
+-						track_info_.loop_length * 2;
  397
+-		}
  398
+-		if ( track_info_.length <= 0 )
  399
+-			track_info_.length = (long) (2.5 * 60 * 1000);
  400
+-		emu_->set_fade( track_info_.length );
  401
++		if ( track_info_->length <= 0 )
  402
++			track_info_->length = track_info_->intro_length +
  403
++						track_info_->loop_length * 2;
  404
++		
  405
++		if ( track_info_->length <= 0 )
  406
++			track_info_->length = (long) (2.5 * 60 * 1000);
  407
++		gme_set_fade( emu_, track_info_->length );
  408
+ 		
  409
+ 		paused = false;
  410
+ 		sound_start();
  411
+@@ -137,7 +144,7 @@
  412
+ 
  413
+ bool Music_Player::track_ended() const
  414
+ {
  415
+-	return emu_ ? emu_->track_ended() : false;
  416
++	return emu_ ? gme_track_ended( emu_ ) : false;
  417
+ }
  418
+ 
  419
+ void Music_Player::set_stereo_depth( double tempo )
  420
+@@ -150,15 +157,15 @@
  421
+ void Music_Player::set_tempo( double tempo )
  422
+ {
  423
+ 	suspend();
  424
+-	emu_->set_tempo( tempo );
  425
++	gme_set_tempo( emu_, tempo );
  426
+ 	resume();
  427
+ }
  428
+ 
  429
+ void Music_Player::mute_voices( int mask )
  430
+ {
  431
+ 	suspend();
  432
+-	emu_->mute_voices( mask );
  433
+-	emu_->ignore_silence( mask != 0 );
  434
++	gme_mute_voices( emu_, mask );
  435
++	gme_ignore_silence( emu_, mask != 0 );
  436
+ 	resume();
  437
+ }
  438
+ 
  439
+@@ -167,7 +174,7 @@
  440
+ 	Music_Player* self = (Music_Player*) data;
  441
+ 	if ( self->emu_ )
  442
+ 	{
  443
+-		if ( self->emu_->play( count, out ) ) { } // ignore error
  444
++		if ( gme_play( self->emu_, count, out ) ) { } // ignore error
  445
+ 		
  446
+ 		if ( self->scope_buf )
  447
+ 			memcpy( self->scope_buf, out, self->scope_buf_size * sizeof *self->scope_buf );
  448
+diff -Naur game-music-emu-0.5.5.old/player/Music_Player.h game-music-emu-0.5.5/player/Music_Player.h
  449
+--- game-music-emu-0.5.5.old/player/Music_Player.h	2009-07-27 06:14:46.000000000 +0200
  450
++++ game-music-emu-0.5.5/player/Music_Player.h	2010-03-22 14:24:56.280934821 +0100
  451
+@@ -4,18 +4,18 @@
  452
+ #ifndef MUSIC_PLAYER_H
  453
+ #define MUSIC_PLAYER_H
  454
+ 
  455
+-#include "gme/Music_Emu.h"
  456
++#include "gme.h"
  457
+ 
  458
+ class Music_Player {
  459
+ public:
  460
+ 	// Initialize player and set sample rate
  461
+-	blargg_err_t init( long sample_rate = 44100 );
  462
++	gme_err_t init( long sample_rate = 44100 );
  463
+ 	
  464
+ 	// Load game music file. NULL on success, otherwise error string.
  465
+-	blargg_err_t load_file( const char* path );
  466
++	gme_err_t load_file( const char* path );
  467
+ 	
  468
+ 	// (Re)start playing track. Tracks are numbered from 0 to track_count() - 1.
  469
+-	blargg_err_t start_track( int track );
  470
++	gme_err_t start_track( int track );
  471
+ 	
  472
+ 	// Stop playing current file
  473
+ 	void stop();
  474
+@@ -26,7 +26,7 @@
  475
+ 	int track_count() const;
  476
+ 	
  477
+ 	// Info for current track
  478
+-	track_info_t const& track_info() const { return track_info_; }
  479
++	gme_info_t const& track_info() const { return *track_info_; }
  480
+ 	
  481
+ 	// Pause/resume playing current track.
  482
+ 	void pause( int );
  483
+@@ -59,7 +59,7 @@
  484
+ 	long sample_rate;
  485
+ 	int scope_buf_size;
  486
+ 	bool paused;
  487
+-	track_info_t track_info_;
  488
++	gme_info_t* track_info_;
  489
+ 	
  490
+ 	void suspend();
  491
+ 	void resume();
4  gnome/empathy/ChangeLog.SB
... ...
@@ -1,3 +1,7 @@
  1
+Tue Aug 24 12:47:41 BRT 2010
  2
+empathy-2.30.3-x86_64-1xinc.tgz:
  3
+Updated to 2.30.3.
  4
++--------------------------+
1 5
 Sun Jun 27 01:35:34 BRT 2010
2 6
 empathy-2.30.2-x86_64-2xinc.tgz:
3 7
 Rebuilt.
11  gnome/empathy/empathy.SlackBuild
@@ -43,7 +43,7 @@ fi
43 43
 NAME=empathy
44 44
 PKG=${PKG:-${TMP}/package-${NAME}}
45 45
 
46  
-VERSION=${VERSION:-2.30.2}
  46
+VERSION=${VERSION:-2.30.3}
47 47
 SVER=$(echo ${VERSION} | cut -d . -f1-2)
48 48
 if [ "${SB_NATIVE}" = "YES" ] ;then
49 49
   ARCH=${ARCH:-$(uname -m)}
@@ -56,7 +56,7 @@ else
56 56
   SLKTARGET=${SLKTARGET:-i486}
57 57
 fi
58 58
 SLKDTARGET=${SLKDTARGET:-slackware}
59  
-BUILD=${BUILD:-2}
  59
+BUILD=${BUILD:-1}
60 60
 NJOBS=${NJOBS:-$(( $(getconf _NPROCESSORS_ONLN) + 1 ))}
61 61
 DOCDIR=${PKG}/usr/doc/${NAME}-${VERSION}
62 62
 SBDIR=${PKG}/usr/src/slackbuilds/gnome/${NAME}
@@ -68,15 +68,18 @@ DATE=$(LC_ALL=C date +%d-%b-%Y)
68 68
 
69 69
 SRCDIR=${NAME}-${VERSION}
70 70
 SRCARCHIVE=${SRCDIR}.tar.bz2
  71
+SSRCARCHIVE=${SRCDIR}.sha256sum
71 72
 
72 73
 DL_PROG=${DL_PROG:-wget}
73 74
 DL_TO=${DL_TO:-5}
74 75
 DL_OPTS=${DL_OPTS:-"--timeout=${DL_TO}"}
75 76
 GNOME_MIRROR=${GNOME_MIRROR:-http://ftp.gnome.org/pub/GNOME/sources}
76  
-DL_URL="${GNOME_MIRROR}/${NAME}/${SVER}/${SRCARCHIVE}"
  77
+DL_URL="${GNOME_MIRROR}/${NAME}/${SVER}"
77 78
 
78 79
 # if source is not present, download in source rootdir if possible
79  
-test -r ${CWD}/${SRCARCHIVE} || ${DL_PROG} ${DL_OPTS} ${DL_URL} || exit 1
  80
+for file in ${SRCARCHIVE} ${SSRCARCHIVE} ;do
  81
+  test -r ${CWD}/${file} || ${DL_PROG} ${DL_OPTS} ${DL_URL}/${file} || exit 1
  82
+done
80 83
 
81 84
 if [ "${SB_NATIVE}" = "YES" ] ;then
82 85
   SLKCFLAGS="-O2 -march=native -mtune=native ${SB_ECFLAGS} -pipe"
4  gnome/system-config-printer/ChangeLog.SB
... ...
@@ -1,3 +1,7 @@
  1
+Wed Aug 25 01:58:57 BRT 2010
  2
+system-config-printer-1.2.4-x86_64-1xinc.tgz:
  3
+Updated to 1.2.4.
  4
++--------------------------+
1 5
 Thu Jul 29 17:53:18 BRT 2010
2 6
 system-config-printer-1.2.3-x86_64-1xinc.tgz:
3 7
 Updated to 1.2.3.
2  gnome/system-config-printer/system-config-printer.SlackBuild
@@ -43,7 +43,7 @@ fi
43 43
 NAME=system-config-printer
44 44
 PKG=${PKG:-${TMP}/package-${NAME}}
45 45
 
46  
-VERSION=${VERSION:-1.2.3}
  46
+VERSION=${VERSION:-1.2.4}
47 47
 SVER=$(echo ${VERSION} | cut -d . -f1-2)
48 48
 if [ "${SB_NATIVE}" = "YES" ] ;then
49 49
   ARCH=${ARCH:-$(uname -m)}
4  highlight/ChangeLog.SB
... ...
@@ -1,3 +1,7 @@
  1
+Wed Aug 25 12:10:19 BRT 2010
  2
+highlight-3.1-x86_64-1xinc.tgz:
  3
+Updated to 3.1.
  4
++--------------------------+
1 5
 Fri Aug 13 21:11:58 BRT 2010
2 6
 highlight-3.1.beta3-x86_64-1xinc.tgz:
3 7
 Updated to 3.1-beta3.
</