add timitidy.., Xaw3d, sdl-mixer
This commit is contained in:
suvari
@@ -0,0 +1,42 @@
|
||||
#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# Licensed under the GNU General Public License, version 3.
|
||||
# See the file http://www.gnu.org/licenses/gpl.txt
|
||||
|
||||
from pisi.actionsapi import autotools
|
||||
from pisi.actionsapi import pisitools
|
||||
from pisi.actionsapi import shelltools
|
||||
from pisi.actionsapi import get
|
||||
|
||||
WorkDir = "SDL_mixer-%s" % get.srcVERSION()
|
||||
|
||||
def setup():
|
||||
pisitools.dosed("timidity/config.h", "/usr/local/lib/timidity", "/usr/share/timidity")
|
||||
|
||||
options = "--disable-dependency-tracking \
|
||||
--disable-static \
|
||||
--enable-music-midi \
|
||||
--enable-music-timidity-midi \
|
||||
--enable-music-mod \
|
||||
--enable-music-mp3 \
|
||||
--enable-music-ogg"
|
||||
|
||||
if get.buildTYPE() == "emul32":
|
||||
options += " --includedir=/usr/include \
|
||||
--libdir=/usr/lib32"
|
||||
|
||||
shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig")
|
||||
shelltools.export("CFLAGS", "%s -m32" % get.CFLAGS())
|
||||
shelltools.export("CXXFLAGS", "%s -m32" % get.CXXFLAGS())
|
||||
shelltools.export("LDFLAGS", "%s -m32" % get.LDFLAGS())
|
||||
|
||||
autotools.configure(options)
|
||||
|
||||
def build():
|
||||
autotools.make()
|
||||
|
||||
def install():
|
||||
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
|
||||
|
||||
pisitools.dodoc("CHANGES", "COPYING", "README")
|
||||
@@ -0,0 +1,20 @@
|
||||
diff -Nur SDL_mixer-1.2.11-old//Makefile.in SDL_mixer-1.2.11/Makefile.in
|
||||
--- SDL_mixer-1.2.11-old//Makefile.in 2011-08-25 01:09:55.007000503 +0300
|
||||
+++ SDL_mixer-1.2.11/Makefile.in 2011-08-25 01:11:19.172000277 +0300
|
||||
@@ -72,13 +72,13 @@
|
||||
@PLAYMUS_DEPENDS@
|
||||
|
||||
$(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
|
||||
- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
|
||||
+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
|
||||
|
||||
$(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET)
|
||||
- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
|
||||
+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
|
||||
|
||||
$(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET)
|
||||
- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
|
||||
+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
|
||||
|
||||
install: all install-hdrs install-lib #install-bin
|
||||
install-hdrs:
|
||||
@@ -0,0 +1,110 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>sdl-mixer</Name>
|
||||
<Homepage>http://www.libsdl.org/projects/SDL_mixer/</Homepage>
|
||||
<Packager>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Packager>
|
||||
<License>LGPLv2.1</License>
|
||||
<IsA>library</IsA>
|
||||
<Summary>SDL mixer library</Summary>
|
||||
<Description>SDL_mixer is a SDL library for loading sound files.</Description>
|
||||
<Archive sha1sum="a20fa96470ad9e1052f1957b77ffa68fb090b384" type="targz">http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>libsdl-devel</Dependency>
|
||||
<Dependency>libmikmod-devel</Dependency>
|
||||
<Dependency>libvorbis-devel</Dependency>
|
||||
<Dependency>libogg-devel</Dependency>
|
||||
<Dependency>smpeg-devel</Dependency>
|
||||
<Dependency>timidity</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<!--<Patch level="1">dev_snd_seq.patch</Patch>-->
|
||||
<Patch level="1">ldflags.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>sdl-mixer</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>libsdl</Dependency>
|
||||
<Dependency>libmikmod</Dependency>
|
||||
<Dependency>libvorbis</Dependency>
|
||||
<Dependency>libogg</Dependency>
|
||||
<Dependency>smpeg</Dependency>
|
||||
<Dependency>timidity</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib</Path>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Name>sdl-mixer-devel</Name>
|
||||
<Summary>Development files for sdl-mixer</Summary>
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">sdl-mixer</Dependency>
|
||||
<Dependency>libsdl-devel</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="header">/usr/include</Path>
|
||||
<Path fileType="data">/usr/lib/pkgconfig</Path>
|
||||
<Path fileType="data">/usr/lib32/pkgconfig</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Name>sdl-mixer-32bit</Name>
|
||||
<PartOf>emul32</PartOf>
|
||||
<Summary>32-bit shared libraries for sdl-mixer</Summary>
|
||||
<BuildType>emul32</BuildType>
|
||||
<BuildDependencies>
|
||||
<Dependency>libsdl-32bit</Dependency>
|
||||
<Dependency>libmikmod-32bit</Dependency>
|
||||
<Dependency>libvorbis-32bit</Dependency>
|
||||
<Dependency>libogg-32bit</Dependency>
|
||||
<Dependency>smpeg-32bit</Dependency>
|
||||
<Dependency>glibc-32bit</Dependency>
|
||||
</BuildDependencies>
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">sdl-mixer</Dependency>
|
||||
<Dependency>libsdl-32bit</Dependency>
|
||||
<Dependency>libmikmod-32bit</Dependency>
|
||||
<Dependency>libvorbis-32bit</Dependency>
|
||||
<Dependency>libogg-32bit</Dependency>
|
||||
<Dependency>smpeg-32bit</Dependency>
|
||||
<Dependency>glibc-32bit</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib32/</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2016-02-21</Date>
|
||||
<Version>1.2.12</Version>
|
||||
<Comment>Rebuild</Comment>
|
||||
<Name>Kamil Atlı</Name>
|
||||
<Email>suvarice@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2014-03-09</Date>
|
||||
<Version>1.2.12</Version>
|
||||
<Comment>Rebuild for buildhost</Comment>
|
||||
<Name>Osman Erkan</Name>
|
||||
<Email>osman.erkan@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="1">
|
||||
<Date>2012-08-29</Date>
|
||||
<Version>1.2.12</Version>
|
||||
<Comment>First release</Comment>
|
||||
<Name>Osman Erkan</Name>
|
||||
<Email>osman.erkan@pisilinux.org</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
@@ -0,0 +1,19 @@
|
||||
<?xml version="1.0" ?>
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>sdl-mixer</Name>
|
||||
<Summary xml:lang="tr">SDL ses yükleme kitaplığı</Summary>
|
||||
<Summary xml:lang="fr">Librairie du mixer SDL.</Summary>
|
||||
<Description xml:lang="tr">SDL_mixer, SDL için bir ses yükleme kitaplığıdır.</Description>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>sdl-mixer-devel</Name>
|
||||
<Summary xml:lang="tr">sdl-mixer için geliştirme dosyaları</Summary>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Name>sdl-mixer-32bit</Name>
|
||||
<Summary xml:lang="tr">sdl-mixer için 32-bit paylaşımlı kitaplıklar</Summary>
|
||||
</Package>
|
||||
</PISI>
|
||||
@@ -0,0 +1,34 @@
|
||||
#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# Licensed under the GNU General Public License, version 3.
|
||||
# See the file http://www.gnu.org/licenses/gpl.txt
|
||||
|
||||
from pisi.actionsapi import autotools
|
||||
from pisi.actionsapi import pisitools
|
||||
from pisi.actionsapi import shelltools
|
||||
from pisi.actionsapi import get
|
||||
|
||||
import os
|
||||
from os.path import join
|
||||
|
||||
NoStrip = "/"
|
||||
WorkDir = "./"
|
||||
|
||||
def setup():
|
||||
pisitools.dosed("timidity.cfg", "dir /nethome/sak95/shom/lib/timidity/", "dir /usr/share/timidity/shompatches/")
|
||||
pisitools.dosed("sfx.cfg", "^source ", "source shompatches/")
|
||||
pisitools.dosed("timidity.cfg", "^source ", "source shompatches/")
|
||||
|
||||
for root, dirs, files in os.walk("inst"):
|
||||
for name in dirs:
|
||||
shelltools.chmod(join(root, name), 0755)
|
||||
for name in files:
|
||||
shelltools.chmod(join(root, name), 0644)
|
||||
|
||||
shelltools.chmod("*.cfg", 0644)
|
||||
|
||||
def install():
|
||||
pisitools.dodir("/usr/share/timidity/shompatches")
|
||||
pisitools.insinto("/usr/share/timidity/shompatches", "*.cfg")
|
||||
pisitools.insinto("/usr/share/timidity/shompatches", "inst")
|
||||
@@ -0,0 +1,48 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>timidity-shompatches</Name>
|
||||
<Homepage>http://www.i.h.kyoto-u.ac.jp</Homepage>
|
||||
<Packager>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Packager>
|
||||
<License>as-is</License>
|
||||
<IsA>data</IsA>
|
||||
<Summary>Sound patches for Timidity (Shom)</Summary>
|
||||
<Description>Containts Matsumoto Shoji's patch collection for TiMidity (Roland SC-55 style)</Description>
|
||||
<Archive sha1sum="70e6dada9656ab79253a80bcf5505d2151551397" type="zip">ftp://ftp.tr.debian.org/gentoo/distfiles/shominst-0409.zip</Archive>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>timidity-shompatches</Name>
|
||||
<Files>
|
||||
<Path fileType="data">/usr/share/timidity</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2016-02-21</Date>
|
||||
<Version>0.409</Version>
|
||||
<Comment>Rebuild</Comment>
|
||||
<Name>Kamil Atlı</Name>
|
||||
<Email>suvarice@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2014-03-09</Date>
|
||||
<Version>0.409</Version>
|
||||
<Comment>Rebuild</Comment>
|
||||
<Name>Varol Maksutoğlu</Name>
|
||||
<Email>waroi@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="1">
|
||||
<Date>2010-10-12</Date>
|
||||
<Version>0.409</Version>
|
||||
<Comment>First release</Comment>
|
||||
<Name>Pisi Linux Admins</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" ?>
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>timidity-shompatches</Name>
|
||||
<Summary xml:lang="tr">Timidity ses bilgisi dosyaları</Summary>
|
||||
<Description xml:lang="tr">Matsumoto Shoji'nin TiMidity (Roland SC-55 stili) ses bilgisi dosyaları</Description>
|
||||
</Source>
|
||||
</PISI>
|
||||
@@ -0,0 +1,47 @@
|
||||
#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# Licensed under the GNU General Public License, version 3.
|
||||
# See the file http://www.gnu.org/licenses/gpl.txt
|
||||
|
||||
from pisi.actionsapi import autotools
|
||||
from pisi.actionsapi import pisitools
|
||||
from pisi.actionsapi import shelltools
|
||||
from pisi.actionsapi import get
|
||||
|
||||
WorkDir = "TiMidity++-%s" % get.srcVERSION()
|
||||
|
||||
def setup():
|
||||
audios = "flac,speex,vorbis,ao,alsa,jack"
|
||||
interfaces = "ncurses,vt100,alsaseq,server,network,gtk"
|
||||
|
||||
shelltools.export("CFLAGS", "%s -D_GNU_SOURCE" % get.CFLAGS())
|
||||
autotools.autoconf()
|
||||
autotools.configure('--localstatedir=/var/state/timidity \
|
||||
--with-elf \
|
||||
--enable-audio="%s" \
|
||||
--enable-interface="%s" \
|
||||
--enable-server \
|
||||
--enable-network \
|
||||
--enable-dynamic \
|
||||
--enable-vt100 \
|
||||
--enable-spline=cubic \
|
||||
--enable-slang \
|
||||
--enable-ncurses \
|
||||
--with-x \
|
||||
--enable-spectrogram \
|
||||
--enable-wrd \
|
||||
--enable-xskin \
|
||||
--enable-gtk \
|
||||
--with-default-output=alsa \
|
||||
--enable-alsaseq' % (audios, interfaces))
|
||||
|
||||
def build():
|
||||
autotools.make()
|
||||
|
||||
def install():
|
||||
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
|
||||
|
||||
pisitools.dosym("/etc/timidity.cfg", "/usr/share/timidity/timidity.cfg")
|
||||
|
||||
pisitools.dodoc("AUTHORS", "ChangeLog*", "NEWS", "README*", "doc/C/README*")
|
||||
@@ -0,0 +1,53 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
serviceType = "local"
|
||||
serviceDesc = _({"en": "Timidity Virtual MIDI Sequencer for Alsa",
|
||||
"tr": "Timidity Sanal MIDI Ardışımlayıcı"})
|
||||
|
||||
MSG_ERR_TIMDPTCH = _({"en": "Failed to set patchset %s for Timidity.",
|
||||
"tr": "Yama kümesi %s Timidity'ye atanamadı.",
|
||||
})
|
||||
|
||||
from comar.service import *
|
||||
import os
|
||||
|
||||
@synchronized
|
||||
def start():
|
||||
|
||||
if config.get("USE_ESOUND", "") == "yes":
|
||||
startDependencies("esound")
|
||||
|
||||
# set up sound fonts
|
||||
patchset = config.get("PATCHSET", "shompatches")
|
||||
currentlink = "/usr/share/timidity/current"
|
||||
|
||||
try:
|
||||
currentpatch = os.readlink(currentlink)
|
||||
except:
|
||||
currentpatch = None
|
||||
|
||||
if patchset != currentpatch:
|
||||
if not os.path.exists("/usr/share/timidity/%s" % patchset) and not os.path.exists(patchset):
|
||||
fail(MSG_ERR_TIMDPTCH % patchset)
|
||||
else:
|
||||
if currentpatch:
|
||||
os.unlink(currentlink)
|
||||
os.symlink(patchset, currentlink)
|
||||
|
||||
if config.get("TIMIDITY_PCM_NAME", "") != "":
|
||||
loadEnvironment()
|
||||
os.environ["TIMIDITY_PCM_NAME"]=config.get("TIMIDITY_PCM_NAME")
|
||||
|
||||
startService(command="/usr/bin/timidity",
|
||||
args="-iA %s" % config.get("TIMIDITY_OPTS", ""),
|
||||
pidfile="/run/timidity.pid",
|
||||
makepid=True,
|
||||
detach=True,
|
||||
donotify=True)
|
||||
|
||||
@synchronized
|
||||
def stop():
|
||||
stopService(pidfile="/run/timidity.pid",
|
||||
donotify=True)
|
||||
|
||||
def status():
|
||||
return isServiceRunning("/run/timidity.pid")
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
--- TiMidity++-2.14.0/interface/xskin_c.c
|
||||
+++ TiMidity++-2.14.0/interface/xskin_c.c
|
||||
@@ -228,7 +228,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
-#if 0
|
||||
static void ctl_speana_data(double *val, int size) {
|
||||
|
||||
/* 0 <= val[n] <= (AMP*NCOLOR) */
|
||||
@@ -280,7 +279,6 @@
|
||||
|
||||
return;
|
||||
}
|
||||
-#endif
|
||||
|
||||
/*ARGSUSED*/
|
||||
static int ctl_open(int using_stdin, int using_stdout) {
|
||||
@@ -0,0 +1,117 @@
|
||||
#!/bin/sh
|
||||
|
||||
VERSION_MJ="1"
|
||||
VERSION_MN="0"
|
||||
VERSION_RV="0000"
|
||||
VERSION_AP=""
|
||||
VERSION="${VERSION_MJ}.${VERSION_MN}${VERSION_AP}"
|
||||
|
||||
PATCHDIR="/usr/share/timidity"
|
||||
|
||||
# Below is the user's local patchset
|
||||
HOME_TARGET="$HOME/.timidity/current"
|
||||
TARGET="${HOME_TARGET}"
|
||||
|
||||
show_help() {
|
||||
echo "$0 ${VERSION}"
|
||||
echo "Usage: $0 [-g] -s PATCHSET"
|
||||
echo " or: $0 -r"
|
||||
echo " or: $0 [OPTION]"
|
||||
echo "Set the current timidity patch set to PATCHSET."
|
||||
echo
|
||||
echo "Mandatory arguments to long options are mandatory for short options too."
|
||||
echo " -g Change the global patch set instead of the"
|
||||
echo " user's patch set"
|
||||
echo " -r Change current user's patch set to current"
|
||||
echo " system patch set"
|
||||
echo " -s [PATCHSET] Change to patch set PATCHSET"
|
||||
echo " --help display this help and exit"
|
||||
}
|
||||
|
||||
show_error() {
|
||||
|
||||
echo "$0: bad or missing argument"
|
||||
echo "Try '$0 --help' for more information."
|
||||
}
|
||||
|
||||
set_patch() {
|
||||
TARGET=$1
|
||||
PATCHSET=$2
|
||||
# If something borken, no go
|
||||
if [ ! -L ${TARGET} -a -e ${TARGET} ] || [ ! -d ${PATCHDIR}/${PATCHSET} ]; then
|
||||
if [ ! -L ${TARGET} -a -e ${TARGET} ]; then
|
||||
echo " Error: ${TARGET} exists and is not a symlink"
|
||||
return -1
|
||||
fi
|
||||
if [ ! -d ${PATCHDIR}/${PATCHSET} ]; then
|
||||
echo " Error: patch set ${PATCHSET} does not exist"
|
||||
echo " Look in ${PATCHDIR}/ for patch sets"
|
||||
return -1
|
||||
fi
|
||||
echo " Error: Undefined error."
|
||||
return -1
|
||||
fi
|
||||
echo -n " * Switching to ${PATCHSET} Timidity patch set..."
|
||||
rm -f ${TARGET} 2>/dev/null
|
||||
ln -s ${PATCHDIR}/${PATCHSET} ${TARGET} 2>/dev/null
|
||||
echo " [ OK ]"
|
||||
return 0
|
||||
}
|
||||
|
||||
restore_patches() {
|
||||
TARGET=$1
|
||||
echo -n " * Setting up local patch set to system global..."
|
||||
rm -f ${TARGET} 2>/dev/null
|
||||
ln -s ${PATCHDIR}/current ${TARGET}
|
||||
echo " [ OK ]"
|
||||
}
|
||||
|
||||
##############
|
||||
# Processing #
|
||||
#############
|
||||
|
||||
# Make sure home directory is there
|
||||
if [ ! -e ${HOME}/.timidity ]; then
|
||||
mkdir -p ${HOME}/.timidity
|
||||
restore_patches $TARGET
|
||||
fi
|
||||
|
||||
|
||||
################
|
||||
# No arguments #
|
||||
###############
|
||||
|
||||
if [ -z "$1" ]; then
|
||||
show_error
|
||||
exit 1
|
||||
fi
|
||||
|
||||
#########################
|
||||
# Actual processing loop#
|
||||
########################
|
||||
while [ -n "$1" ]; do
|
||||
case "$1" in
|
||||
-g)
|
||||
TARGET="/usr/share/timidity/current"
|
||||
;;
|
||||
-r)
|
||||
restore_patches ${HOME_TARGET}
|
||||
exit 0
|
||||
;;
|
||||
-s)
|
||||
PATCHSET="$2"
|
||||
shift
|
||||
;;
|
||||
--help)
|
||||
show_help
|
||||
exit 0
|
||||
;;
|
||||
*)
|
||||
show_error
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
set_patch $TARGET $PATCHSET
|
||||
@@ -0,0 +1,24 @@
|
||||
##############################################################################
|
||||
#
|
||||
# timidity-update core configuration file
|
||||
#
|
||||
# Easy process:
|
||||
#
|
||||
# 1. Change directory to patch directory
|
||||
# 2. Source current/timidity.cfg
|
||||
#
|
||||
# Current patch set will always be symlinked to current, so make sure that the
|
||||
# proper timidity.cfg is in there
|
||||
#
|
||||
#
|
||||
# - source /usr/share/timidity
|
||||
# - source ~/.timidity/current
|
||||
# - Make ~/.timidity/current point to the current patch set, or to whatever
|
||||
# the individual user sets
|
||||
# - If ~/.timidity/current isn't found, it will try
|
||||
# /usr/share/timidity/current
|
||||
#
|
||||
|
||||
dir /usr/share/timidity
|
||||
dir ~/.timidity
|
||||
source current/timidity.cfg
|
||||
@@ -0,0 +1,39 @@
|
||||
# TIMIDITY_OPTS
|
||||
# Command line arguements to be passed to timidity. -iA is always used
|
||||
# Common options:
|
||||
# -Os : Output to ALSA pcm device
|
||||
# -Oe : Output to esd
|
||||
# -On : Output to NAS
|
||||
# -Oj : Output to JACK
|
||||
#
|
||||
# -B<n>,<m> : Set number of buffer fragments(n), and buffer size(2^m)
|
||||
#
|
||||
# -EFreverb=0 : Disable MIDI reverb effect control
|
||||
# -EFreverb=1[,level] : Enable MIDI reverb effect control
|
||||
# "level" is optional to specify reverb level [0..127]
|
||||
# This effect is only available in stereo
|
||||
# (default)
|
||||
# -EFreverb=2 : Global reverb effect
|
||||
|
||||
TIMIDITY_OPTS="-B2,8 -Os -EFreverb=0 -EFchorus=0"
|
||||
|
||||
# USE_ESOUND
|
||||
# if you want to use esound, make this option yes and set the correct TIMIDITY_OPTS
|
||||
|
||||
USE_ESOUND="no"
|
||||
|
||||
# PATCHSET
|
||||
# Define the sound patch set that timidity will use. Default is shompatches.
|
||||
PATCHSET="shompatches"
|
||||
|
||||
|
||||
# TIMIDITY_PCM_NAME
|
||||
# This option can be used to choose an alternate ALSA pcm device. This will
|
||||
# be most useful for users of the dmix alsa plugin or those with multiple
|
||||
# cards. If you don't know what this is, chances are you want the default.
|
||||
|
||||
# default alsa device fails to work as a service, since pulseaudio is not reachable
|
||||
# from the service scripts' environment. Workaround with using hw:0
|
||||
#TIMIDITY_PCM_NAME="default"
|
||||
TIMIDITY_PCM_NAME="hw:0"
|
||||
|
||||
@@ -0,0 +1,99 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>timidity</Name>
|
||||
<Homepage>http://timidity.sourceforge.net/</Homepage>
|
||||
<Packager>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Packager>
|
||||
<License>GPLv2</License>
|
||||
<IsA>service</IsA>
|
||||
<Summary>Software synthesizer and MIDI converter</Summary>
|
||||
<Description>Timidity is a software synthesizer, MIDI player and MIDI to other sound formats converter which can also emulate a midi port.</Description>
|
||||
<Archive sha1sum="3d1d18ddf3e52412985af9a49dbe7ad345b478a8" type="tarbz2">mirrors://sourceforge/timidity/TiMidity++-2.14.0.tar.bz2</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>alsa-lib-devel</Dependency>
|
||||
<Dependency>libao-devel</Dependency>
|
||||
<Dependency>libXaw-devel</Dependency>
|
||||
<Dependency>flac-devel</Dependency>
|
||||
<Dependency>libvorbis-devel</Dependency>
|
||||
<Dependency>speex-devel</Dependency>
|
||||
<Dependency>libXext-devel</Dependency>
|
||||
<Dependency>libogg-devel</Dependency>
|
||||
<Dependency>jack-audio-connection-kit-devel</Dependency>
|
||||
<Dependency>gtk2-devel</Dependency>
|
||||
<Dependency>Xaw3d-devel</Dependency>
|
||||
<Dependency>glib2-devel</Dependency>
|
||||
<Dependency>libX11-devel</Dependency>
|
||||
<Dependency>ncurses-devel</Dependency>
|
||||
<Dependency>libpng-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<Patch level="1">timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>timidity</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>alsa-lib</Dependency>
|
||||
<Dependency>libao</Dependency>
|
||||
<Dependency>libXaw</Dependency>
|
||||
<Dependency>flac</Dependency>
|
||||
<Dependency>libvorbis</Dependency>
|
||||
<Dependency>speex</Dependency>
|
||||
<Dependency>libXext</Dependency>
|
||||
<Dependency>libogg</Dependency>
|
||||
<Dependency>jack-audio-connection-kit</Dependency>
|
||||
<Dependency>gtk2</Dependency>
|
||||
<Dependency>timidity-shompatches</Dependency>
|
||||
<Dependency>Xaw3d</Dependency>
|
||||
<Dependency>glib2</Dependency>
|
||||
<Dependency>libX11</Dependency>
|
||||
<Dependency>libpng</Dependency>
|
||||
<Dependency>ncurses</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="config">/etc</Path>
|
||||
<Path fileType="executable">/usr/bin</Path>
|
||||
<Path fileType="library">/usr/lib</Path>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
<Path fileType="man">/usr/share/man</Path>
|
||||
<Path fileType="data">/usr/share/timidity</Path>
|
||||
</Files>
|
||||
<AdditionalFiles>
|
||||
<AdditionalFile owner="root" permission="0644" target="/etc/conf.d/timidity">timidity.conf.d</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0644" target="/etc/timidity.cfg">timidity.cfg</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0755" target="/usr/bin/timidity-update">timidity-update</AdditionalFile>
|
||||
</AdditionalFiles>
|
||||
<Provides>
|
||||
<COMAR script="service.py">System.Service</COMAR>
|
||||
</Provides>
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2016-02-21</Date>
|
||||
<Version>2.14.0</Version>
|
||||
<Comment>Rebuild</Comment>
|
||||
<Name>Kamil Atlı</Name>
|
||||
<Email>suvarice@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2014-03-09</Date>
|
||||
<Version>2.14.0</Version>
|
||||
<Comment>Rebuild</Comment>
|
||||
<Name>Varol Maksutoğlu</Name>
|
||||
<Email>waroi@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="1">
|
||||
<Date>2012-08-28</Date>
|
||||
<Version>2.14.0</Version>
|
||||
<Comment>First release</Comment>
|
||||
<Name>Fatih Turgel</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" ?>
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>timidity</Name>
|
||||
<Summary xml:lang="tr">MIDI WAV dönüştürücüsü</Summary>
|
||||
<Description xml:lang="tr">OSS ve ALSA ses çıkışı üretebilen MIDI'den WAV oluşturabilen ve midi aygıt emulasyonu yapabilen sunucu</Description>
|
||||
</Source>
|
||||
</PISI>
|
||||
+110826
-110474
File diff suppressed because it is too large
Load Diff
@@ -1 +1 @@
|
||||
3b7e8ecdc33b25d8ccf31faeaa2b812f003cc6b1
|
||||
c25136304ddbdbbd87a399f55b60333af6ad01af
|
||||
Binary file not shown.
@@ -1 +1 @@
|
||||
83ebe1562e94a53eff3f87e2728a5da8f3a86dd1
|
||||
f62418bd6060dcfc4532a92dc7025872fcf3a581
|
||||
@@ -0,0 +1,26 @@
|
||||
#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# Licensed under the GNU General Public License, version 3.
|
||||
# See the file http://www.gnu.org/licenses/gpl.txt
|
||||
|
||||
from pisi.actionsapi import get
|
||||
from pisi.actionsapi import autotools
|
||||
from pisi.actionsapi import pisitools
|
||||
from pisi.actionsapi import shelltools
|
||||
|
||||
def setup():
|
||||
autotools.autoreconf("-vif")
|
||||
autotools.configure("--prefix=/usr \
|
||||
--disable-static \
|
||||
--enable-arrow-scrollbars \
|
||||
--enable-gray-stipples \
|
||||
--enable-multiplane-bitmaps")
|
||||
|
||||
def build():
|
||||
autotools.make()
|
||||
|
||||
def install():
|
||||
autotools.rawInstall("DESTDIR=%s install" % get.installDIR())
|
||||
|
||||
pisitools.dodoc("ChangeLog","COPYING","README","src/README.XAW3D")
|
||||
@@ -0,0 +1,162 @@
|
||||
diff -up libXaw3d-1.6.1/src/Label.c.3Dlabel libXaw3d-1.6.1/src/Label.c
|
||||
--- libXaw3d-1.6.1/src/Label.c.3Dlabel 2011-09-19 15:42:36.000000000 -0600
|
||||
+++ libXaw3d-1.6.1/src/Label.c 2012-02-25 14:44:33.766774776 -0700
|
||||
@@ -416,9 +416,16 @@ GetgrayGC(LabelWidget lw)
|
||||
static void
|
||||
compute_bitmap_offsets (LabelWidget lw)
|
||||
{
|
||||
- if (lw->label.lbm_height != 0)
|
||||
- lw->label.lbm_y = (lw->core.height - lw->label.lbm_height) / 2;
|
||||
- else
|
||||
+ /*
|
||||
+ * bitmap will be eventually be displayed at
|
||||
+ * (internal_width, internal_height + lbm_y)
|
||||
+ */
|
||||
+ if (lw->label.lbm_height != 0) {
|
||||
+ lw->label.lbm_y = (lw->core.height -
|
||||
+ (lw->threeD.shadow_width * 2 +
|
||||
+ lw->label.internal_height * 2 +
|
||||
+ lw->label.lbm_height)) / 2;
|
||||
+ } else
|
||||
lw->label.lbm_y = 0;
|
||||
}
|
||||
|
||||
@@ -444,9 +451,11 @@ Initialize(Widget request, Widget new, A
|
||||
{
|
||||
LabelWidget lw = (LabelWidget) new;
|
||||
|
||||
+#if 0
|
||||
/* disable shadows if we're not a subclass of Command */
|
||||
if (!XtIsSubclass(new, commandWidgetClass))
|
||||
lw->threeD.shadow_width = 0;
|
||||
+#endif
|
||||
|
||||
if (lw->label.label == NULL)
|
||||
lw->label.label = XtNewString(lw->core.name);
|
||||
@@ -460,18 +469,20 @@ Initialize(Widget request, Widget new, A
|
||||
|
||||
if (lw->core.height == 0)
|
||||
lw->core.height = lw->label.label_height +
|
||||
- 2 * lw->label.internal_height;
|
||||
+ 2 * lw->label.internal_height +
|
||||
+ 2 * lw->threeD.shadow_width;
|
||||
|
||||
set_bitmap_info(lw); /* req's core.height, sets label.lbm_* */
|
||||
|
||||
if (lw->label.lbm_height > lw->label.label_height)
|
||||
lw->core.height = lw->label.lbm_height +
|
||||
- 2 * lw->label.internal_height;
|
||||
+ 2 * lw->label.internal_height;
|
||||
|
||||
if (lw->core.width == 0)
|
||||
lw->core.width = lw->label.label_width +
|
||||
- 2 * lw->label.internal_width +
|
||||
- LEFT_OFFSET(lw); /* req's label.lbm_width */
|
||||
+ 2 * lw->label.internal_width +
|
||||
+ 2 * lw->threeD.shadow_width +
|
||||
+ LEFT_OFFSET(lw); /* req's label.lbm_width */
|
||||
|
||||
lw->label.label_x = lw->label.label_y = 0;
|
||||
(*XtClass(new)->core_class.resize) ((Widget)lw);
|
||||
@@ -549,14 +560,16 @@ Redisplay(Widget gw, XEvent *event, Regi
|
||||
if (w->label.depth == 1)
|
||||
XCopyPlane(XtDisplay(gw), pm, XtWindow(gw), gc, 0, 0,
|
||||
w->label.lbm_width, w->label.lbm_height,
|
||||
- (int) w->label.internal_width,
|
||||
- (int) w->label.lbm_y,
|
||||
+ (int) w->label.internal_width + w->threeD.shadow_width,
|
||||
+ (int) w->label.internal_height + w->threeD.shadow_width
|
||||
+ + w->label.lbm_y,
|
||||
(unsigned long) 1L);
|
||||
else
|
||||
XCopyArea(XtDisplay(gw), pm, XtWindow(gw), gc, 0, 0,
|
||||
w->label.lbm_width, w->label.lbm_height,
|
||||
- (int) w->label.internal_width,
|
||||
- (int) w->label.lbm_y);
|
||||
+ (int) w->label.internal_width + w->threeD.shadow_width,
|
||||
+ (int) w->label.internal_height + w->threeD.shadow_width
|
||||
+ + w->label.lbm_y);
|
||||
}
|
||||
|
||||
#ifdef XAW_INTERNATIONALIZATION
|
||||
@@ -646,14 +659,17 @@ _Reposition(LabelWidget lw, Dimension wi
|
||||
Position *dx, Position *dy)
|
||||
{
|
||||
Position newPos;
|
||||
- Position leftedge = lw->label.internal_width + LEFT_OFFSET(lw);
|
||||
+ Position leftedge = lw->label.internal_width + LEFT_OFFSET(lw) +
|
||||
+ lw->threeD.shadow_width;
|
||||
+
|
||||
|
||||
switch (lw->label.justify) {
|
||||
case XtJustifyLeft:
|
||||
newPos = leftedge;
|
||||
break;
|
||||
case XtJustifyRight:
|
||||
- newPos = width - lw->label.label_width - lw->label.internal_width;
|
||||
+ newPos = width - (lw->label.label_width + lw->label.internal_width +
|
||||
+ lw->threeD.shadow_width);
|
||||
break;
|
||||
case XtJustifyCenter:
|
||||
default:
|
||||
@@ -745,17 +761,20 @@ SetValues(Widget current, Widget request
|
||||
if (newlw->label.resize && was_resized) {
|
||||
if (curlw->core.height == reqlw->core.height && !checks[HEIGHT])
|
||||
newlw->core.height = newlw->label.label_height +
|
||||
- 2 * newlw->label.internal_height;
|
||||
+ 2 * newlw->label.internal_height +
|
||||
+ 2 * newlw->threeD.shadow_width;
|
||||
|
||||
set_bitmap_info (newlw); /* req's core.height, sets label.lbm_* */
|
||||
|
||||
if (newlw->label.lbm_height > newlw->label.label_height)
|
||||
newlw->core.height = newlw->label.lbm_height +
|
||||
- 2 * newlw->label.internal_height;
|
||||
+ 2 * newlw->label.internal_height +
|
||||
+ 2 * newlw->threeD.shadow_width;
|
||||
|
||||
if (curlw->core.width == reqlw->core.width && !checks[WIDTH])
|
||||
newlw->core.width = newlw->label.label_width +
|
||||
2 * newlw->label.internal_width +
|
||||
+ 2 * newlw->threeD.shadow_width +
|
||||
LEFT_OFFSET(newlw); /* req's label.lbm_width */
|
||||
}
|
||||
|
||||
@@ -764,15 +783,20 @@ SetValues(Widget current, Widget request
|
||||
if (checks[HEIGHT]) {
|
||||
if (newlw->label.label_height > newlw->label.lbm_height)
|
||||
i = newlw->label.label_height +
|
||||
- 2 * newlw->label.internal_height;
|
||||
+ 2 * newlw->label.internal_height +
|
||||
+ 2 * newlw->threeD.shadow_width;
|
||||
else
|
||||
- i = newlw->label.lbm_height + 2 * newlw->label.internal_height;
|
||||
+ i = newlw->label.lbm_height +
|
||||
+ 2 * newlw->label.internal_height +
|
||||
+ 2 * newlw->threeD.shadow_width;
|
||||
if (i > newlw->core.height)
|
||||
newlw->core.height = i;
|
||||
}
|
||||
if (checks[WIDTH]) {
|
||||
- i = newlw->label.label_width + 2 * newlw->label.internal_width +
|
||||
- LEFT_OFFSET(newlw); /* req's label.lbm_width */
|
||||
+ i = newlw->label.label_width +
|
||||
+ 2 * newlw->label.internal_width +
|
||||
+ 2 * newlw->threeD.shadow_width +
|
||||
+ LEFT_OFFSET(newlw); /* req's label.lbm_width */
|
||||
if (i > newlw->core.width)
|
||||
newlw->core.width = i;
|
||||
}
|
||||
@@ -843,9 +867,11 @@ QueryGeometry(Widget w, XtWidgetGeometry
|
||||
preferred->request_mode = CWWidth | CWHeight;
|
||||
preferred->width = (lw->label.label_width +
|
||||
2 * lw->label.internal_width +
|
||||
+ 2 * lw->threeD.shadow_width +
|
||||
LEFT_OFFSET(lw));
|
||||
preferred->height = lw->label.label_height +
|
||||
- 2 * lw->label.internal_height;
|
||||
+ 2 * lw->label.internal_height +
|
||||
+ 2 * lw->threeD.shadow_width;
|
||||
if ( ((intended->request_mode & (CWWidth | CWHeight))
|
||||
== (CWWidth | CWHeight)) &&
|
||||
intended->width == preferred->width &&
|
||||
@@ -0,0 +1,60 @@
|
||||
diff -up libXaw3d-1.6.1/src/AsciiSink.c.fontset libXaw3d-1.6.1/src/AsciiSink.c
|
||||
--- libXaw3d-1.6.1/src/AsciiSink.c.fontset 2012-02-01 12:24:00.000000000 -0700
|
||||
+++ libXaw3d-1.6.1/src/AsciiSink.c 2012-02-25 14:52:46.802779081 -0700
|
||||
@@ -513,6 +513,8 @@ Initialize(Widget request, Widget new, A
|
||||
{
|
||||
AsciiSinkObject sink = (AsciiSinkObject) new;
|
||||
|
||||
+ if (!sink->ascii_sink.font) XtError("Aborting: no font found\n");
|
||||
+
|
||||
GetGC(sink);
|
||||
|
||||
sink->ascii_sink.insertCursorOn= CreateInsertCursor(XtScreenOfObject(new));
|
||||
diff -up libXaw3d-1.6.1/src/Command.c.fontset libXaw3d-1.6.1/src/Command.c
|
||||
--- libXaw3d-1.6.1/src/Command.c.fontset 2011-09-19 15:42:36.000000000 -0600
|
||||
+++ libXaw3d-1.6.1/src/Command.c 2012-02-25 14:51:26.075372823 -0700
|
||||
@@ -218,6 +218,8 @@ Initialize(Widget request, Widget new, A
|
||||
CommandWidget cbw = (CommandWidget) new;
|
||||
int shape_event_base, shape_error_base;
|
||||
|
||||
+ if (!cbw->label.font) XtError("Aborting: no font found\n");
|
||||
+
|
||||
if (cbw->command.shape_style != XawShapeRectangle
|
||||
&& !XShapeQueryExtension(XtDisplay(new), &shape_event_base,
|
||||
&shape_error_base))
|
||||
diff -up libXaw3d-1.6.1/src/List.c.fontset libXaw3d-1.6.1/src/List.c
|
||||
--- libXaw3d-1.6.1/src/List.c.fontset 2011-10-09 12:01:20.000000000 -0600
|
||||
+++ libXaw3d-1.6.1/src/List.c 2012-02-25 14:53:16.327465260 -0700
|
||||
@@ -362,6 +362,8 @@ Initialize(Widget junk, Widget new, ArgL
|
||||
{
|
||||
ListWidget lw = (ListWidget) new;
|
||||
|
||||
+ if (!lw->list.font) XtError("Aborting: no font found\n");
|
||||
+
|
||||
/*
|
||||
* Initialize all private resources.
|
||||
*/
|
||||
diff -up libXaw3d-1.6.1/src/SmeBSB.c.fontset libXaw3d-1.6.1/src/SmeBSB.c
|
||||
--- libXaw3d-1.6.1/src/SmeBSB.c.fontset 2011-09-19 15:42:36.000000000 -0600
|
||||
+++ libXaw3d-1.6.1/src/SmeBSB.c 2012-02-25 14:50:19.056358107 -0700
|
||||
@@ -207,6 +207,8 @@ Initialize(Widget request, Widget new, A
|
||||
else
|
||||
entry->sme_bsb.label = XtNewString( entry->sme_bsb.label );
|
||||
|
||||
+ if (!entry->sme_bsb.font) XtError("Aborting: no font found\n");
|
||||
+
|
||||
CreateGCs(new);
|
||||
|
||||
GetBitmapInfo(new, TRUE); /* Left Bitmap Info */
|
||||
diff -up libXaw3d-1.6.1/src/Tip.c.fontset libXaw3d-1.6.1/src/Tip.c
|
||||
--- libXaw3d-1.6.1/src/Tip.c.fontset 2012-02-15 12:10:38.000000000 -0700
|
||||
+++ libXaw3d-1.6.1/src/Tip.c 2012-02-25 14:50:19.058358017 -0700
|
||||
@@ -248,6 +248,8 @@ XawTipInitialize(Widget req, Widget w, A
|
||||
TipWidget tip = (TipWidget)w;
|
||||
XGCValues values;
|
||||
|
||||
+ if (!tip->tip.font) XtError("Aborting: no font found\n");
|
||||
+
|
||||
tip->tip.timer = 0;
|
||||
|
||||
values.foreground = tip->tip.foreground;
|
||||
@@ -0,0 +1,260 @@
|
||||
diff -up libXaw3d-1.6.1/src/Text.c.hsbar libXaw3d-1.6.1/src/Text.c
|
||||
--- libXaw3d-1.6.1/src/Text.c.hsbar 2011-10-06 13:17:19.000000000 -0600
|
||||
+++ libXaw3d-1.6.1/src/Text.c 2012-02-25 14:54:41.996656624 -0700
|
||||
@@ -495,8 +495,10 @@ CreateHScrollBar(TextWidget ctx)
|
||||
(XtPointer) NULL);
|
||||
|
||||
/**/
|
||||
- ctx->text.r_margin.bottom += hbar->core.height + hbar->core.border_width;
|
||||
- ctx->text.margin.bottom = ctx->text.r_margin.bottom;
|
||||
+ if (ctx->text.scroll_vert == XawtextScrollAlways) {
|
||||
+ ctx->text.r_margin.bottom += hbar->core.height + hbar->core.border_width;
|
||||
+ ctx->text.margin.bottom = ctx->text.r_margin.bottom;
|
||||
+ }
|
||||
/**/
|
||||
PositionHScrollBar(ctx);
|
||||
if (XtIsRealized((Widget)ctx)) {
|
||||
@@ -519,8 +521,10 @@ DestroyHScrollBar(TextWidget ctx)
|
||||
if (hbar == NULL) return;
|
||||
|
||||
/**/
|
||||
- ctx->text.r_margin.bottom -= hbar->core.height + hbar->core.border_width;
|
||||
- ctx->text.margin.bottom = ctx->text.r_margin.bottom;
|
||||
+ if (ctx->text.scroll_vert == XawtextScrollAlways) {
|
||||
+ ctx->text.r_margin.bottom -= hbar->core.height + hbar->core.border_width;
|
||||
+ ctx->text.margin.bottom = ctx->text.r_margin.bottom;
|
||||
+ }
|
||||
/**/
|
||||
if (ctx->text.vbar == NULL)
|
||||
XtRemoveCallback((Widget) ctx, XtNunrealizeCallback, UnrealizeScrollbars,
|
||||
diff -up libXaw3d-1.6.1/src/Viewport.c.hsbar libXaw3d-1.6.1/src/Viewport.c
|
||||
--- libXaw3d-1.6.1/src/Viewport.c.hsbar 2012-01-24 14:56:03.000000000 -0700
|
||||
+++ libXaw3d-1.6.1/src/Viewport.c 2012-02-25 14:58:18.474098582 -0700
|
||||
@@ -244,7 +244,7 @@ Initialize(Widget request, Widget new, A
|
||||
XtVaGetValues((Widget)(w->viewport.threeD), XtNshadowWidth, &sw, NULL);
|
||||
if (sw)
|
||||
{
|
||||
- pad = 2;
|
||||
+ pad = 2 * sw;
|
||||
|
||||
arg_cnt = 0;
|
||||
XtSetArg(threeD_args[arg_cnt], XtNborderWidth, 0); arg_cnt++;
|
||||
@@ -262,8 +262,8 @@ Initialize(Widget request, Widget new, A
|
||||
XtSetArg(clip_args[arg_cnt], XtNright, XtChainRight); arg_cnt++;
|
||||
XtSetArg(clip_args[arg_cnt], XtNtop, XtChainTop); arg_cnt++;
|
||||
XtSetArg(clip_args[arg_cnt], XtNbottom, XtChainBottom); arg_cnt++;
|
||||
- XtSetArg(clip_args[arg_cnt], XtNwidth, w->core.width - 2 * sw); arg_cnt++;
|
||||
- XtSetArg(clip_args[arg_cnt], XtNheight, w->core.height - 2 * sw); arg_cnt++;
|
||||
+ XtSetArg(clip_args[arg_cnt], XtNwidth, w->core.width - pad); arg_cnt++;
|
||||
+ XtSetArg(clip_args[arg_cnt], XtNheight, w->core.height - pad); arg_cnt++;
|
||||
|
||||
w->viewport.clip = XtCreateManagedWidget("clip", widgetClass, new,
|
||||
clip_args, arg_cnt);
|
||||
@@ -283,8 +283,8 @@ Initialize(Widget request, Widget new, A
|
||||
* Set the clip widget to the correct height.
|
||||
*/
|
||||
|
||||
- clip_width = w->core.width - 2 * sw;
|
||||
- clip_height = w->core.height - 2 * sw;
|
||||
+ clip_width = w->core.width - pad;
|
||||
+ clip_height = w->core.height - pad;
|
||||
|
||||
if ( (h_bar != NULL) &&
|
||||
((int)w->core.width >
|
||||
@@ -509,23 +509,13 @@ ComputeLayout(Widget widget, Boolean que
|
||||
XtWidgetGeometry intended;
|
||||
Dimension pad = 0, sw = 0;
|
||||
|
||||
- /*
|
||||
- * I've made two optimizations here. The first does away with the
|
||||
- * loop, and the second defers setting the child dimensions to the
|
||||
- * clip if smaller until after adjusting for possible scrollbars.
|
||||
- * If you find that these go too far, define the identifiers here
|
||||
- * as required. -- djhjr
|
||||
- */
|
||||
-#define NEED_LAYOUT_LOOP
|
||||
-#undef PREP_CHILD_TO_CLIP
|
||||
-
|
||||
if (child == (Widget) NULL) return;
|
||||
|
||||
XtVaGetValues(threeD, XtNshadowWidth, &sw, NULL);
|
||||
- if (sw) pad = 2;
|
||||
+ if (sw) pad = 2 * sw;
|
||||
|
||||
- clip_width = w->core.width - 2 * sw;
|
||||
- clip_height = w->core.height - 2 * sw;
|
||||
+ clip_width = w->core.width - pad;
|
||||
+ clip_height = w->core.height - pad;
|
||||
intended.request_mode = CWBorderWidth;
|
||||
intended.border_width = 0;
|
||||
|
||||
@@ -536,10 +526,8 @@ ComputeLayout(Widget widget, Boolean que
|
||||
&clip_width, &clip_height);
|
||||
}
|
||||
else {
|
||||
-#ifdef NEED_LAYOUT_LOOP
|
||||
Dimension prev_width, prev_height;
|
||||
XtGeometryMask prev_mode;
|
||||
-#endif
|
||||
XtWidgetGeometry preferred;
|
||||
|
||||
needshoriz = needsvert = False;
|
||||
@@ -553,31 +541,25 @@ ComputeLayout(Widget widget, Boolean que
|
||||
if (!w->viewport.allowhoriz)
|
||||
intended.request_mode |= CWWidth;
|
||||
|
||||
-#ifdef PREP_CHILD_TO_CLIP
|
||||
- if ((int)child->core.width < clip_width)
|
||||
- intended.width = clip_width;
|
||||
+ if ((int)child->core.width < clip_width + pad)
|
||||
+ intended.width = clip_width + pad;
|
||||
else
|
||||
-#endif
|
||||
intended.width = child->core.width;
|
||||
|
||||
- if (!w->viewport.allowvert)
|
||||
- intended.request_mode |= CWHeight;
|
||||
-
|
||||
-#ifdef PREP_CHILD_TO_CLIP
|
||||
- if ((int)child->core.height < clip_height)
|
||||
- intended.height = clip_height;
|
||||
+ if ((int)child->core.height < clip_height + pad)
|
||||
+ intended.height = clip_height + pad;
|
||||
else
|
||||
-#endif
|
||||
intended.height = child->core.height;
|
||||
|
||||
+ if (!w->viewport.allowvert)
|
||||
+ intended.request_mode |= CWHeight;
|
||||
+
|
||||
if (!query) {
|
||||
preferred.width = child->core.width;
|
||||
preferred.height = child->core.height;
|
||||
}
|
||||
|
||||
-#ifdef NEED_LAYOUT_LOOP
|
||||
do { /* while intended != prev */
|
||||
-#endif
|
||||
if (query) {
|
||||
(void) XtQueryGeometry( child, &intended, &preferred );
|
||||
if ( !(preferred.request_mode & CWWidth) )
|
||||
@@ -585,12 +567,9 @@ ComputeLayout(Widget widget, Boolean que
|
||||
if ( !(preferred.request_mode & CWHeight) )
|
||||
preferred.height = intended.height;
|
||||
}
|
||||
-
|
||||
-#ifdef NEED_LAYOUT_LOOP
|
||||
prev_width = intended.width;
|
||||
prev_height = intended.height;
|
||||
prev_mode = intended.request_mode;
|
||||
-#endif
|
||||
|
||||
/*
|
||||
* Note that having once decided to turn on either bar
|
||||
@@ -600,7 +579,7 @@ ComputeLayout(Widget widget, Boolean que
|
||||
|
||||
#define CheckHoriz() \
|
||||
if (w->viewport.allowhoriz && \
|
||||
- (int)preferred.width > clip_width + 2 * sw) { \
|
||||
++ (int)preferred.width > clip_width + pad) { \
|
||||
if (!needshoriz) { \
|
||||
Widget horiz_bar = w->viewport.horiz_bar; \
|
||||
needshoriz = True; \
|
||||
@@ -615,7 +594,7 @@ ComputeLayout(Widget widget, Boolean que
|
||||
/* enddef */
|
||||
CheckHoriz();
|
||||
if (w->viewport.allowvert &&
|
||||
- (int)preferred.height > clip_height + 2 * sw) {
|
||||
+ (int)preferred.height > clip_height + pad) {
|
||||
if (!needsvert) {
|
||||
Widget vert_bar = w->viewport.vert_bar;
|
||||
needsvert = True;
|
||||
@@ -629,38 +608,22 @@ ComputeLayout(Widget widget, Boolean que
|
||||
intended.height = preferred.height;
|
||||
}
|
||||
|
||||
-#ifdef PREP_CHILD_TO_CLIP
|
||||
if (!w->viewport.allowhoriz ||
|
||||
- (int)preferred.width < clip_width) {
|
||||
- intended.width = clip_width;
|
||||
+ (int)preferred.width < clip_width + pad) {
|
||||
+ intended.width = clip_width + pad;
|
||||
intended.request_mode |= CWWidth;
|
||||
}
|
||||
if (!w->viewport.allowvert ||
|
||||
- (int)preferred.height < clip_height) {
|
||||
- intended.height = clip_height;
|
||||
+ (int)preferred.height < clip_height + pad) {
|
||||
+ intended.height = clip_height + pad;
|
||||
intended.request_mode |= CWHeight;
|
||||
}
|
||||
-#endif
|
||||
-#ifdef NEED_LAYOUT_LOOP
|
||||
+
|
||||
} while ( intended.request_mode != prev_mode ||
|
||||
(intended.request_mode & CWWidth &&
|
||||
intended.width != prev_width) ||
|
||||
(intended.request_mode & CWHeight &&
|
||||
intended.height != prev_height) );
|
||||
-#endif
|
||||
-
|
||||
-#ifndef PREP_CHILD_TO_CLIP
|
||||
- if (!w->viewport.allowhoriz ||
|
||||
- (int)preferred.width < clip_width) {
|
||||
- intended.width = clip_width;
|
||||
- intended.request_mode |= CWWidth;
|
||||
- }
|
||||
- if (!w->viewport.allowvert ||
|
||||
- (int)preferred.height < clip_height) {
|
||||
- intended.height = clip_height;
|
||||
- intended.request_mode |= CWHeight;
|
||||
- }
|
||||
-#endif
|
||||
}
|
||||
|
||||
bar_width = bar_height = 0;
|
||||
@@ -705,7 +668,7 @@ ComputeLayout(Widget widget, Boolean que
|
||||
else {
|
||||
int bw = bar->core.border_width;
|
||||
XtResizeWidget( bar,
|
||||
- (Dimension)(clip_width + 2 * sw), bar->core.height,
|
||||
+ (Dimension)(clip_width + pad), bar->core.height,
|
||||
(Dimension)bw );
|
||||
XtMoveWidget( bar,
|
||||
(Position)((needsvert && !w->viewport.useright)
|
||||
@@ -730,7 +693,7 @@ ComputeLayout(Widget widget, Boolean que
|
||||
else {
|
||||
int bw = bar->core.border_width;
|
||||
XtResizeWidget( bar,
|
||||
- bar->core.width, (Dimension)(clip_height + 2 * sw),
|
||||
+ bar->core.width, (Dimension)(clip_height + pad),
|
||||
(Dimension)bw );
|
||||
XtMoveWidget( bar,
|
||||
(Position)(w->viewport.useright
|
||||
@@ -780,7 +743,7 @@ ComputeWithForceBars(Widget widget, Bool
|
||||
*/
|
||||
|
||||
XtVaGetValues((Widget)(w->viewport.threeD), XtNshadowWidth, &sw, NULL);
|
||||
- if (sw) pad = 2;
|
||||
+ if (sw) pad = 2 * sw;
|
||||
|
||||
if (w->viewport.allowvert) {
|
||||
if (w->viewport.vert_bar == NULL)
|
||||
@@ -926,7 +889,7 @@ GeometryRequestPlusScrollbar(ViewportWid
|
||||
Dimension pad = 0, sw = 0;
|
||||
|
||||
XtVaGetValues((Widget)(w->viewport.threeD), XtNshadowWidth, &sw, NULL);
|
||||
- if (sw) pad = 2;
|
||||
+ if (sw) pad = 2 * sw;
|
||||
|
||||
plusScrollbars = *request;
|
||||
if ((bar = w->viewport.horiz_bar) == (Widget)NULL)
|
||||
@@ -997,7 +960,7 @@ GeometryManager(Widget child, XtWidgetGe
|
||||
return XtGeometryNo;
|
||||
|
||||
XtVaGetValues((Widget)(w->viewport.threeD), XtNshadowWidth, &sw, NULL);
|
||||
- if (sw) pad = 2;
|
||||
+ if (sw) pad = 2 * sw;
|
||||
|
||||
allowed = *request;
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>Xaw3d</Name>
|
||||
<Homepage>http://freshmeat.net/projects/xaw3d/</Homepage>
|
||||
<Packager>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Packager>
|
||||
<License>X11</License>
|
||||
<IsA>library</IsA>
|
||||
<Summary>Replacement of the Xaw widget set that comes with X</Summary>
|
||||
<Description>Xaw3d is a general-purpose replacement for the Athena toolkit that adds a 3D appearance and support for XPM images.</Description>
|
||||
<Archive sha1sum="c01bf719032f2da0da0b92344570528c51775d41" type="targz">http://xorg.freedesktop.org/archive/individual/lib/libXaw3d-1.6.2.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>util-macros</Dependency>
|
||||
<Dependency>libXt-devel</Dependency>
|
||||
<Dependency>libXmu-devel</Dependency>
|
||||
<Dependency>libXpm-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<Patch level="1">Xaw3d-1.6.1-3Dlabel.patch</Patch>
|
||||
<Patch level="1">Xaw3d-1.6.1-fontset.patch</Patch>
|
||||
<Patch level="1">Xaw3d-1.6.1-hsbar.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>Xaw3d</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>libXt</Dependency>
|
||||
<Dependency>libX11</Dependency>
|
||||
<Dependency>libXmu</Dependency>
|
||||
<Dependency>libXpm</Dependency>
|
||||
<Dependency>libXext</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib</Path>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Name>Xaw3d-devel</Name>
|
||||
<Summary>Development files for Xaw3d</Summary>
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">Xaw3d</Dependency>
|
||||
<Dependency>libXt-devel</Dependency>
|
||||
<Dependency>libX11-devel</Dependency>
|
||||
<Dependency>libXmu-devel</Dependency>
|
||||
<Dependency>libXext-devel</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="header">/usr/include</Path>
|
||||
<Path fileType="data">/usr/lib/pkgconfig</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="5">
|
||||
<Date>2016-02-21</Date>
|
||||
<Version>1.6.2</Version>
|
||||
<Comment>Release bump.</Comment>
|
||||
<Name>Marcin Bojara</Name>
|
||||
<Email>marcin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="4">
|
||||
<Date>2013-10-07</Date>
|
||||
<Version>1.6.2</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Serdar Soytetir</Name>
|
||||
<Email>kaptan@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="3">
|
||||
<Date>2013-08-25</Date>
|
||||
<Version>1.6.2</Version>
|
||||
<Comment>Release bump.</Comment>
|
||||
<Name>Marcin Bojara</Name>
|
||||
<Email>marcin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2013-07-26</Date>
|
||||
<Version>1.6.2</Version>
|
||||
<Comment>Release bump for rebuild.</Comment>
|
||||
<Name>Serdar Soytetir</Name>
|
||||
<Email>kaptan@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="1">
|
||||
<Date>2012-06-01</Date>
|
||||
<Version>1.6.2</Version>
|
||||
<Comment>First release</Comment>
|
||||
<Name>Erdem Artan</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
@@ -0,0 +1,14 @@
|
||||
<?xml version="1.0" ?>
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>Xaw3d</Name>
|
||||
<Summary xml:lang="tr">XPM imajlarına 3D görüntüsü ve desteği ekleyen bir kütüphanedir</Summary>
|
||||
<Description xml:lang="tr">Xaw3d, Athena araçlarının yerini alması amaçlanarak hazırlanmıştır. Ek olarak 3B görünüş sağlar ve XPM resimlerini destekler.</Description>
|
||||
<Description xml:lang="fr">Xaw3d est globalement le remplaçant de la boîte à outils Athena. Il ajoute une apparence 3D ainsi que le support des images XMP.</Description>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>Xaw3d-devel</Name>
|
||||
<Summary xml:lang="tr">Xaw3d için geliştirme dosyaları</Summary>
|
||||
</Package>
|
||||
</PISI>
|
||||
Reference in New Issue
Block a user