diff options
| author | root <root@rshg054.dnsready.net> | 2013-03-03 01:05:38 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-03-03 01:05:38 -0800 |
| commit | 945c9cd1e94fab87653f84598812dec707843d26 (patch) | |
| tree | bd1fccd08cd5fff72cdc25cb51382b882b4faa3e | |
| parent | 98aa0004e23472ee63753fded33cd55d8b942f36 (diff) | |
Sun Mar 3 01:04:55 PST 2013
45 files changed, 2172 insertions, 779 deletions
diff --git a/community/cgminer/PKGBUILD b/community/cgminer/PKGBUILD index 53b234b6a..44ed3480b 100644 --- a/community/cgminer/PKGBUILD +++ b/community/cgminer/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 84079 2013-02-10 07:52:11Z fyan $ +# $Id: PKGBUILD 85507 2013-03-02 07:06:14Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: monson <holymonson@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: David Manouchehri <david@davidmanouchehri.com> pkgname=cgminer -pkgver=2.10.5 +pkgver=2.11.0 _build= pkgrel=1 pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer." @@ -18,7 +18,6 @@ optdepends=('opencl-nvidia: OpenCL implementation for NVIDIA' 'opencl-catalyst: OpenCL implementation for AMD') source=("http://ck.kolivas.org/apps/cgminer/$pkgname-$pkgver.tar.bz2" "$pkgname.conf.d" - "$pkgname" "$pkgname.service") backup=("etc/conf.d/$pkgname" "etc/$pkgname.conf") @@ -44,14 +43,12 @@ package() { make DESTDIR="$pkgdir" install - install -Dm755 "$srcdir"/$pkgname "$pkgdir"/etc/rc.d/$pkgname install -Dm644 "$srcdir"/$pkgname.service "$pkgdir"/usr/lib/systemd/system/$pkgname.service install -Dm644 "$srcdir"/$pkgname.conf.d "$pkgdir"/etc/conf.d/$pkgname sed 's#/usr/local/bin#/usr/bin#g' example.conf > $pkgname.conf install -Dm644 $pkgname.conf "$pkgdir"/etc/$pkgname.conf } -md5sums=('80b00c77a3c38bcb457a47989dfa153c' +md5sums=('e0f597a373203acc346d7a07a694d03e' 'fe4a243fabe24608f5c05e40f0f118f6' - 'ee39698273671fee0e98d4af16014c36' 'bd76fc92fedce18c59ccea2aa79cc664') diff --git a/community/cgminer/cgminer b/community/cgminer/cgminer deleted file mode 100644 index 9081e8e77..000000000 --- a/community/cgminer/cgminer +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -DAEMON=cgminer - -# stupid patch var -export HOME=/root - -[ -r /etc/conf.d/$DAEMON ] && . /etc/conf.d/$DAEMON - -if [ -r $CGMINER_CONF ]; then - ARGS="--config $CGMINER_CONF $CGMINER_ARGS" -else - ARGS="--url $CGMINER_PROTOCOL://$CGMINER_IP:$CGMINER_PORT --user $CGMINER_USER --pass $CGMINER_PASS $CGMINER_ARGS" -fi - -PID=$(get_pid $DAEMON) - -case "$1" in - start) - stat_busy "Starting $DAEMON" - [ -z "$PID" ] && $DAEMON $ARGS &>/dev/null & - if [ $? = 0 ]; then - add_daemon $DAEMON - stat_done - else - stat_fail - exit 1 - fi - ;; - stop) - stat_busy "Stopping $DAEMON" - [ -n "$PID" ] && kill $PID &>/dev/null - if [ $? = 0 ]; then - rm_daemon $DAEMON - stat_done - else - stat_fail - exit 1 - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/chrony/PKGBUILD b/community/chrony/PKGBUILD index 3c923f6ea..42af8ff73 100644 --- a/community/chrony/PKGBUILD +++ b/community/chrony/PKGBUILD @@ -1,6 +1,7 @@ -# $Id: PKGBUILD 83627 2013-02-04 07:41:05Z bpiotrowski $ +# $Id: PKGBUILD 85509 2013-03-02 08:05:25Z thestinger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Maintainer: Daniel Micay <danielmicay@gmail.com> # Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net> # Contributor: cdhotfire <cdhotfire@gmail.com> # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> @@ -8,7 +9,7 @@ pkgname=chrony pkgver=1.27 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight NTP client and server' arch=('i686' 'x86_64') url="http://chrony.tuxfamily.org/" @@ -28,10 +29,15 @@ build() { } package() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install install -Dm0644 $srcdir/$pkgname-$pkgver/examples/chrony.conf.example $pkgdir/etc/chrony.conf + + # Arch's kernel has enhanced RTC support, make chrony use it by default + sed -ie '/^! \(rtconutc\|rtcfile \/etc\/chrony.rtc\)$/ s/^! //' \ + "$pkgdir/etc/chrony.conf" + install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/chrony.service install -dm755 "$pkgdir/usr/lib/systemd/ntp-units.d" diff --git a/community/fcitx-qt5/PKGBUILD b/community/fcitx-qt5/PKGBUILD new file mode 100644 index 000000000..e761ce6e3 --- /dev/null +++ b/community/fcitx-qt5/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 85500 2013-03-02 04:37:50Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> + +pkgname=fcitx-qt5 +pkgver=0.1.1 +pkgrel=5 +pkgdesc="QT5 IM Module for Fcitx" +arch=('i686' 'x86_64') +url="http://code.google.com/p/fcitx" +license=('GPL') +depends=('fcitx>=4.2.7' 'qt5-base') +makedepends=('cmake') +source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") + +build() { + cd "$srcdir/${pkgname}-${pkgver}" + + mkdir -p build + cd build + + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_LIBDIR=lib .. + make +} + +package() { + cd "$srcdir/${pkgname}-${pkgver}/build" + make install DESTDIR="${pkgdir}" +} +md5sums=('c93a4922ddc4f042749e707673f0fa41') diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD index 584862d1e..22729aa6b 100644 --- a/community/gmerlin/PKGBUILD +++ b/community/gmerlin/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 85325 2013-03-01 02:43:05Z cinelli $ +# $Id: PKGBUILD 85496 2013-03-02 02:50:51Z cinelli $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> pkgname=gmerlin pkgver=1.2.0 pkgrel=2 pkgdesc="Multimedia architecture for Linux" -arch=('any') +arch=('i686' 'x86_64') url="http://openmovieeditor.sourceforge.net/HomePage" license=('GPL') -depends=('gavl' 'libxml2' 'gtk2' 'libxv' 'libvisual' 'libcdio-paranoia' - 'musicbrainz' 'mjpegtools' 'hicolor-icon-theme' 'libgl') -makedepends=('alsa-lib' 'jack' 'libquicktime' 'pulseaudio' 'v4l-utils' 'mesa') +depends=('gavl' 'gtk2' 'libxv' 'libvisual' 'libcdio-paranoia' + 'musicbrainz' 'mjpegtools' 'hicolor-icon-theme') +makedepends=('alsa-lib' 'jack' 'libquicktime' 'pulseaudio' 'v4l-utils' 'mesa-libgl') optdepends=('alsa-lib: for ALSA support' 'jack: for JACK support' 'libquicktime: for movie encoding' diff --git a/community/gmerlin/gmerlin-texi.patch b/community/gmerlin/gmerlin-texi.patch new file mode 100644 index 000000000..b352bf3ff --- /dev/null +++ b/community/gmerlin/gmerlin-texi.patch @@ -0,0 +1,1846 @@ +diff -Naur gmerlin-1.2.0.orig/doc/gmerlin.orig.texi gmerlin-1.2.0/doc/gmerlin.orig.texi +--- gmerlin-1.2.0.orig/doc/gmerlin.orig.texi 1969-12-31 16:00:00.000000000 -0800 ++++ gmerlin-1.2.0/doc/gmerlin.orig.texi 2013-02-27 16:04:03.847930671 -0800 +@@ -0,0 +1,1830 @@ ++\input texinfo @c -*-texinfo-*- ++@comment %**start of header ++@setfilename gmerlin.info ++@include version.texi ++@settitle Gmerlin @value{VERSION} ++@dircategory Gmerlin ++@direntry ++* Gmerlin: (gmerlin). Gmerlin multimedia applications ++@end direntry ++ ++ ++@syncodeindex pg cp ++@comment %**end of header ++@copying ++This manual is for Gmerlin ++(version @value{VERSION}, @value{UPDATED}). ++ ++Copyright @copyright{} 2001-2008 Members of the Gmerlin project. ++ ++@quotation ++Permission is granted to copy, distribute and/or modify this document ++under the terms of the GNU Free Documentation License, Version 1.1 or ++any later version published by the Free Software Foundation; with no ++Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,'' ++and with the Back-Cover Texts as in (a) below. A copy of the ++license is included in the section entitled ``GNU Free Documentation ++License.'' ++ ++(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify ++this GNU Manual, like GNU software. Copies published by the Free ++Software Foundation raise funds for GNU development.'' ++@end quotation ++@end copying ++@titlepage ++@title Gmerlin ++@subtitle for version @value{VERSION}, @value{UPDATED} ++@author Burkhard Plaum (@email{gmerlin@@users.sourceforge.net}) ++@page ++@vskip 0pt plus 1filll ++@insertcopying ++@end titlepage ++ ++@contents ++ ++@ifnottex ++@node Top, Basics, (dir), (dir) ++@top Gmerlin userguide ++Gmerlin user guide. ++ ++@insertcopying ++@end ifnottex ++ ++@menu ++* Basics:: ++* Installation:: ++* General usage information:: ++* Applications:: ++* Plugins:: ++* FAQ:: ++* Get involved:: ++@end menu ++ ++@node Basics, Installation, Top, Top ++@chapter Basics ++This manual should help you to get familiar with gmerlin software. The ++gmerlin software is quite modular, because it consists of multiple ++packages, most of which can be used independently. In this document, ++it is assumed, that you have all packages installed (See Installation below). ++ ++@node Installation, General usage information, Basics, Top ++@chapter Installation ++ ++@menu ++* Requirements:: ++* Compilation and installation:: ++* Binary codecs:: ++@end menu ++ ++@node Requirements ++@section Requirements ++ ++For compiling x264, you need @uref{http://nasm.sourceforge.net/, nasm} ++(@uref{http://www.tortall.net/projects/yasm/, yasm} on x86_64). ++They are included in ++most distributions. Required libraries can be installed from source or from ++binary packages. In the latter case, you must install the development ++packages (e.g. libfoo-devel-1.2.3-4.i386.rpm) also. This is what you need: ++ ++@table @emph ++ ++@item @uref{http://www.alsa-project.org/, Alsa} ++It's the recommended audio architecture ++ ++@item @uref{http://www.tux.org/~ricdude/EsounD.html, esound} ++Only needed if neither Alsa nor OSS work for you. ++ ++@item @uref{http://flac.sourceforge.net/, flac} ++For en-/decoding flac files (optional). ++ ++@item @uref{http://www.gtk.org/, gtk-2.4.x} ++This is needed for compiling the GUI applications. Without it you'll ++get just the core library, which won't be of much use. ++ ++@item @uref{http://www.ijg.org/, libjpeg} ++For reading and writing single JPEG images (strongly recommended) ++ ++@item @uref{http://www.libpng.org/pub/png/libpng.html, libpng} ++For reading and writing single PNG images (strongly recommended). ++Also for decoding png encoded Quicktime and AVI files ++ ++@item @uref{http://www.remotesensing.org/libtiff/, libtiff} ++For reading and writing single TIFF images (Optional) ++ ++@item @uref{http://www.xmlsoft.org/, libxml} ++Required. All kinds of configuration files as well as the media ++tree are xml based. ++ ++@item @uref{http://www.vorbis.com/, vorbis} ++Needed for en-/decoding Vorbis files. Also required for the ++theora encoding. ++ ++@item @uref{http://musicbrainz.org/products/client/index.html, libmusicbrainz} ++Needed for getting Audio CD metadata using ++@uref{http://musicbrainz.org/, musicbrainz} ++ ++@item @uref{http://libcddb.sourceforge.net/, libcddb} ++Needed for getting Audio CD metadata from CDDB servers ++ ++@item Headers for libXv and libXinerama ++These are usually shipped with X11 but some distributions pack the header ++files separately (e.g. libxv-dev, libxinerama-dev). libXv is needed for ++hardware accelerated video playback, libXinerama adds support for ++multi-screen configurations. ++ ++@item @uref{http://www.samba.org/, libsmbclient} ++For loading smb:// URLs (optional). ++ ++@item @uref{http://sourceforge.net/projects/libvisual, libvisual} ++For using libvisual plugins (optional). ++ ++@item @uref{http://www.ladspa.org, Ladspa plugins} ++Optional for audio filters/effects. Good experiences were made with ++the plugin packages @uref{http://www.ladspa.org/cmt/,cmt}, ++@uref{http://plugin.org.uk, swh-plugins} and ++@uref{http://tap-plugins.sourceforge.net, tap-plugins}. Gmerlin looks for them ++at runtime, so you can install them at any time. ++ ++@end table ++ ++From now on, there are 2 ways to proceed: ++@itemize @bullet ++@item You can download the ++@uref{http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=151779, gmerlin-dependencies} ++package, unpack it and install it using the instructions in the README file. ++A full dependencies install will provide you with the complete codec support, ++but some packages you already have might be installed a second time. ++Everything, however, gets into /opt/gmerlin, so there will be no conflicts. ++ ++@item To have more control over the process, download and install the ++libraries listed below manually. ++@end itemize ++ ++@table @emph ++@item @uref{http://www.gnu.org/software/libcdio/, libcdio} ++Neccessary for the VCD, Audio CD and DVD plugins. ++ ++@item @uref{http://www.audiocoding.com/, faad2} ++Needed for MPEG-4 audio support (mp4, aac files). ++ ++@item @uref{http://www.audiocoding.com/, faac} ++Needed for MPEG-4 audio encoding (.aac files) and for AAC encoding via ++libquicktime. ++ ++@item @uref{http://www.ffmpeg.org/, FFmpeg} ++Many codecs, strongly recommended. You should get a sufficiently new ++version from @uref{http://ffmpeg.mplayerhq.hu/download.html, ffmpeg SVN} ++and use --enable-shared when calling configure. Another option is the ++version in the ++@uref{http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=151779, gmerlin-dependencies} package. ++ ++@item @uref{http://www.mp3dev.org/, lame} ++For encoding mp3 files and AVIs with mp3 audio streams with libquicktime. ++ ++@item @uref{http://mad.sourceforge.net/, mad} ++For playing MPEG-1/2 audio (e.g. mp3) ++ ++@item @uref{http://freshmeat.net/redir/libdvdread/17926/url_homepage/downloads.shtml, libdvdread} ++For playing DVDs. Gmerlins method of accessing DVD drives doesn't ++differ much from others. Thus, DVD playback howtos found in the web ++apply for gmerlin as well. ++ ++@item @uref{http://developers.videolan.org/x264.html, x264} ++For H.264 encoding with libquicktime. ++ ++@item @uref{http://www.videolan.org/developers/libdca.html, libdca} ++For decoding DTS streams. ++ ++@item @uref{http://libmpeg2.sourceforge.net/, libmpeg2} ++For decoding MPEG-1/2 Video (like .mpg files and DVD video) ++ ++@item @uref{http://liba52.sourceforge.net/, liba52} ++For playing AC3 (aka DVD audio) streams. ++ ++@item @uref{http://www.musepack.net/, libmpcdec} ++For playing musepack files (optional). ++ ++@item @uref{http://www.theora.org/, theora} ++For en-/decoding theora video (optional). ++ ++@item @uref{http://www.speex.org/, speex} ++For en-/decoding Speex streams (optional). ++ ++@item @uref{http://libquicktime.sourceforge.net/, libquicktime} ++Optional, for the libquicktime based encoding and decoding plugins. ++Mostly necessary if you want to encode video. For decoding Quicktime, ++gmerlin_avdecoder is a lot better. ++ ++@item @uref{http://mjpeg.sourceforge.net/, mjpegtools} ++Optional for en-/decoding yuv4mpeg streams and for encoding high ++quality MPEG video using mpeg2enc and friends. ++ ++@end table ++ ++@node Compilation and installation ++@section Compilation and installation ++ ++If you downloaded a release, make sure, that you have the latest ++version of all packages. Alternatively, you can download the latest ++@uref{http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=151778, gmerlin-all-in-one} ++package. It contains all source packages together ++with optional scripts to build and install them. Check the included ++README file. ++ ++We always try to be compatible ther GNU build system. This means, that ++all gmerlin packages are compiled using the usual ++@code{./configure; make; su; make install} prodecure. Type ++@code{./configure --help} to see the supported options. ++ ++The order is the following: ++ ++@itemize ++@item @uref{http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=50349, gavl} ++@item @uref{http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=14511, gmerlin} ++@item @uref{http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=124659, gmerlin_avdecoder} ++@item @uref{http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=152799, gmerlin-encoders} ++@item @uref{http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=124661, gmerlin-visualizer} ++@end itemize ++ ++@node Binary codecs ++@section Binary codecs ++ ++These must be downloaded from the @uref{http://www1.mplayerhq.hu/MPlayer/releases/codecs/, MPlayer codec page}. Download the file ++essential-YYYYMMDD.tar.bz2, where YYYYMMDD is some date. Unpack the ++.tar.bz2 and move the included files to /usr/lib/codecs. At this ++location, the DLLs will also be found by other players. ++ ++@node General usage information, Applications, Installation, Top ++@chapter General usage information ++ ++@menu ++* Configuration data:: ++* GUI:: ++* GML Syntax: gml. ++* Setting parameters from the commandline:: ++@end menu ++ ++@node Configuration data ++@section Configuration data ++ ++They are saved in the directory @code{~/.gmerlin}, which has subdirectories ++for all applications. The directory "generic" stores common configuration ++data for applications, which have no config dialog. Plugins used by these ++programs can be configured with the gmerlin_plugincfg application. If a ++program misbehaves, especially after a version upgrade, delete the file ++@code{~/.gmerlin/application_dir/config.xml}, where @code{application_dir} ++corresponds to the application. Normally, this shouldn't be necessary. ++ ++@node GUI ++@section GUI ++ ++@menu ++* Introduction: gui_intro. ++* Static and dynamic parameters: gui_statdyn. ++* Configuring input plugins: gui_i. ++* Configuring filters: gui_f. ++* Log messages: gui_log. ++* Tips: gui_tips. ++@end menu ++ ++@node gui_intro ++@subsection Introduction ++ ++We try to make this as consistent as possible across the applications. ++In many windows, you'll see context sensitive menus when you right ++click somewhere. Furthermore, tooltips are enabled in all programs by ++default. You can, however, switch them off if they bother you. ++ ++@node gui_statdyn ++@subsection Static and dynamic parameters ++ ++All GUI applications have their own configuration data. ++This means, that plugin configurations are not shared between ++these applications. ++ ++There is a strict separation between static and plugin dependent ++configurations. ++ ++Most applications have one or more config dialogs ++@ifhtml ++( ++@image{../img/config_16} ++) ++@end ifhtml ++which let you change settings either for several subsystems of the ++application or for plugins, depending on the context. ++To change the plugins themselves, there are separate plugin dialogs ++@ifhtml ++( ++@image{../img/plugin_16} ++) ++@end ifhtml ++which let you select and configure plugins. ++ ++It might be a bit tricky to find out if a special option can be set ++via the the plugin dialog or via ++the global config dialog. The general rule is: All features, which are ++supported by the core architecture, are configured in some global ++dialog. You can expect them to be present on every gmerlin installation ++of the same version. The plugin options vary depending on what plugins ++are installed (that's the reason, why they are separated). ++ ++@node gui_i ++@subsection Configuring input plugins ++ ++@ifhtml ++@image{../img/gui_i} ++@end ifhtml ++ ++This dialog lets you control, how input plugins (or image reader plugins) ++are loaded. The widgets on the right are valid for the plugin, which is selected ++on the left. You have the following options: ++ ++@table @b ++@item Parameters ++@ifhtml ++@image{../img/config_16} ++@end ifhtml ++Lets you set parameters of the plugin. These will be valid when an instance of ++the plugin is opened the next time. If you configure hardware plugins in the player, ++you must close and reopen all device albums for the changes to become effective. ++For plugins, which have no options, this button is disabled. ++@item Info ++@ifhtml ++@image{../img/info_16} ++@end ifhtml ++Pops up a window showing much of the information, which is known to the plugin ++registry. ++@item Priority ++This lets you change the priority of the plugin, if multiple plugins are ++available for a gml. The value can be between 1 and 10. Usually, the default ++priorities are ok. But for image files, the priorities of the ``Image stills input plugin'' and the ``Image video input plugin'' decide, whether images are displayed ++as a slideshow or a video. ++@item Protocols ++Lets you configure the supported network protocols. The protocols should rarely ++be changed and changes are overwritten by a new install of the plugin. For plugins, ++which don't support network streams, the protocols cannot be changed. ++@item Extensions ++Lets you configure the file extensions, which are associated with the plugin. ++If you change the extensions, they are overwritten by a new install of the plugin. ++That's a good reason to report missing file extensions to the developers. ++@end table ++ ++@node gui_f ++@subsection Configuring filters ++ ++@ifhtml ++@image{../img/gui_f} ++@end ifhtml ++ ++This dialog lets you build a filter chain to apply additional changes to the ++A/V data. The GUI player will apply most changes during playback (reinitializing the ++playback pipelines if necessary), the transcoder can change filter chains only per ++track. The filters are processed in top-to-bottom order. ++ ++You have the following buttons: ++ ++@table @b ++@item Add filter ++@ifhtml ++@image{../img/add_16} ++@end ifhtml ++Pops up a dialog, which will let you add new filters to the chain. ++Filter are always added to the end of the chain. ++@item Remove filter ++@ifhtml ++@image{../img/trash_16} ++@end ifhtml ++Deletes the currently selected filter ++@item Configure filter ++@ifhtml ++@image{../img/config_16} ++@end ifhtml ++Set parameters of the currently selected filter ++@item Move to top ++@ifhtml ++@image{../img/top_16} ++@end ifhtml ++Move filter to the top (= the beginning) of the chain ++@item Move up ++@ifhtml ++@image{../img/up_16} ++@end ifhtml ++Move filter up by one ++@item Move down ++@ifhtml ++@image{../img/down_16} ++@end ifhtml ++Move filter down by one ++@item Move to top ++@ifhtml ++@image{../img/bottom_16} ++@end ifhtml ++Move filter to the bottom (= the end) of the chain ++@end table ++ ++@b{Note for the player} ++ ++Even though filter parameters are changed on the fly, ++pressing ``cancel'', without pressing ``apply'' before will ++revert all changes you made. ++ ++@node gui_log ++@subsection Log messages ++ ++@ifhtml ++@image{../img/gui_log} ++ ++@end ifhtml ++Messages from pretty much everywhere in the applications are sent through the ++logging mechanism, and finally show up in the log window. It's the first place to ++look, if something does not work as expected (e.g. an URL does not load). ++There are 4 different types of messages, @b{error}, @b{warning}, @b{info} and ++@b{debug}. In the configuration for the log window, you can select, which message ++you want to see, the colors of the messages and the history size. ++@node gui_tips ++@subsection Tips ++ ++@itemize ++@item Many buttons, which are associated with a list, are disabled unless you select an item in the list ++@item Doubleclicking onto the background of a slider (@strong{not} the slider itself) resets it to the ++ factory default ++@end itemize ++ ++@node gml ++@section GML Syntax ++ ++GMLs (Gmerlin media locations) are pretty much similar to URLs or ++MRLs with the difference, that device plugins support passing the device. ++This makes it possible to use gmls with hardware setups, which have ++multiple devices for each plugin. ++ ++A gml can be: ++ ++@table @bullet ++@item A regular filename ++Optionally preceeded with ``file://''. This means, that @b{/files/music.mp3} is the same as ++@b{file:///files/music.mp3}. ++@item A dash ``-'' or the string ``stdin://'' for reading from stdin ++@item Any valid network URL ++Examples: @b{http://webstream.example.com:8080}, @b{ftp://user:pass@@ftp.example.com/music.mp3} ++@item A "hardare protocol" followed by the device like @b{cda:///dev/hdc}. ++Known hardware protocols are @b{cda} (Audio CD), @b{vcd}, @b{dvd} and ++@b{dvb}. The supported protocols may vary according to your installation. ++@end table ++ ++ ++@node Setting parameters from the commandline ++@section Setting parameters from the commandline ++ ++Gmerlin configuration handling provides the same features for both GUI ++applications and commandline programs. The natural result is, that the ++commandline syntax is a bit more complicated, since parameters can be ++nested. ++ ++In General options have the form ++ ++@code{'parameter1=value1:parameter2=value2...'} ++ ++The quotes are necessary, if the string contains characters, which ++have a special meaning for the shell. ++ ++The syntax of values depends on the type: ++@table @strong ++@item Boolean ++Value can be either 0 or 1. ++@item Integer values ++An integer number. ++@item Float values ++A floating point (i.e. fractional) number. ++@item Strings ++A string. Colons ':' should be escaped with '\'. ++@item Time ++Time is in the format @code{@{[[HH:]MM:]SS@}} while the seconds can be ++fractional. Hours and Minutes are optional, thus any format of ++@code{@{5.5@}}, @code{@{0:05.5@}} or @code{@{0:00:05.5}@} is valid for a time ++of 5.5 seconds. Writing @code{0} instead of @code{00} is also ok. ++@item Enumeration with suboptions ++Value is in the form ++@code{string[@{subparameter1=subvalue1:subparameter2=subvalue2...@}]}. ++The subparameters are optional. E.g. if the option is for selecting a ++plugin, setting string to @code{foo} will select the plugin @code{foo} and ++pass the subparameters (if avaliable) to the @code{foo} plugin. ++@item List or chain with suboptions ++This is like enumeration with suboptions with the difference, that ++you can concatenate multiple options together with colons (:) and ++must enclose everything with braces. For example: ++ ++@code{@{opt1@{param1=value1@}:opt2@{param2=value2@}@}} ++ ++If you use @code{-help}, you'll also see supported ranges for ++numeric types, or supported options for strings (if available). ++ ++@end table ++ ++@node Applications, Plugins, General usage information, Top ++@chapter Applications ++ ++@menu ++* GUI Player:: ++* Player remote control:: ++* GUI Transcoder:: ++* Transcoder remote control:: ++* Commandline player:: ++* Commandline recorder:: ++* Alsamixer:: ++* Visualizer:: ++* Keyboard daemon:: ++@end menu ++ ++@node GUI Player ++@section GUI Player ++Type @code{gmerlin} with optionally any number of files or URLs to start this. ++ ++@menu ++* Invoking gmerlin: gmerlin_player_usage. ++* Main window:: ++* Media tree:: ++* Video window:: ++* Track information: gmerlin_player_trackinfo. ++* Configuring playback pipelines: gmerlin_player_avconfig. ++* Shortcuts: gmerlin_player_shortcuts. ++@end menu ++ ++@node gmerlin_player_usage ++@subsection Invoking gmerlin ++ ++@include gmerlin_player.texi ++ ++@node Main window ++@subsection Main window ++@ifhtml ++@image{../img/player_mainwin} ++ ++@end ifhtml ++ ++It's a usual player window, with self explanatory buttons. ++ ++@menu ++* Main menu: player_mainmenu. ++* Display: player_display. ++@end menu ++ ++@node player_mainmenu ++@subsubsection Main menu ++ ++The menu button will show the main menu of the player. Here, you can ++control practically the whole application: ++ ++@table @b ++@item Audio, video and subtitles ++ See @ref{gmerlin_player_avconfig, Configuring playback pipelines}. ++@item Chapters ++@ifhtml ++@image{../img/player_chapters} ++ ++@end ifhtml ++Chapters in gmerlin are just seekpoints with optional labels. ++If an input plugin supports chapters (e.g. of DVDs), gmerlin will ++make them available through the chapter menu. ++@item Visualizations ++@ifhtml ++@image{../img/player_vis} ++ ++@end ifhtml ++If the upper menu item is enabled and the video window isn't used otherwise, ++Visualizations will be turned on. ++The audio stream of an Audio/video track can be visualized by disabling the video stream ++of that file (See @ref{gmerlin_player_avconfig, Configuring playback pipelines}). ++ ++Then you can set some plugin-independent options ++@ifhtml ++@image{../img/config_16} ++@end ifhtml ++and finally the plugin itself ++@ifhtml ++@image{../img/plugin_16} ++@end ifhtml ++. The menu for visualization plugin works exactly the same as for output plugins ++(See @ref{gmerlin_player_avconfig, Configuring playback pipelines}). ++ ++@item Windows ++@ifhtml ++@image{../img/player_windows} ++ ++@end ifhtml ++Here, you can show or hide the @ref{gui_log, Log window}, the ++@ref{gmerlin_player_trackinfo, Track info window} and the @ref{Media tree}. ++ ++@item Options ++@ifhtml ++@image{../img/player_options} ++ ++@end ifhtml ++Here, you can set @b{Preferences} ++@ifhtml ++@image{../img/config_16} ++@end ifhtml ++, configure @ref{gui_i, Input plugins} ++@ifhtml ++@image{../img/plugin_16} ++@end ifhtml ++, select ++@b{skins} or configure the @ref{Keyboard daemon}. ++ ++@item Commands ++@ifhtml ++@image{../img/player_commands} ++ ++@end ifhtml ++Here you have some commonly used commands. The good news about the ++shortcuts is, that they work in the ++media tree and in the video window as well. ++ ++Only exception are the shortcuts, which map to ASCII-characters ++(Pause and Seek to start), they don't work in the media tree and in albums. ++ ++Use this menu as a quick-help for all global ++shortcuts. ++ ++@item Accessories ++@ifhtml ++@image{../img/player_accessories} ++ ++@end ifhtml ++Here, you can conventiently fire up some other gmerlin applications ++like the @ref{GUI Transcoder}, the @ref{Visualizer} and the ++@ref{Alsamixer}. ++ ++@end table ++ ++@node player_display ++@subsubsection Display ++ ++@ifhtml ++@image{../img/player_display} ++ ++@end ifhtml ++The display is divided into several areas. Left of the ++time display, gmerlin shows an icon denoting the current ++operation mode (playing, paused etc.). Right of the time display, ++you have 2 fields. By left-clicking into the upper field, you can ++change the displayed time value. Options are ++@table @b ++@item Default ++Time is counted since track start ++@item ALL ++Time is counted since album start ++@item REM ++Remaining time until track end ++@item ALL REM ++Remaining time until album end ++@end table ++ ++In the lower field, you can left-click to change the repeat mode. ++Options are @b{no repeat}, @b{repeat current track} and ++@b{repeat current album}. ++ ++At the bottom, there is the scrolltext. It displayes the name of the currently played ++track (which can change e.g. for live radio stations), or a brief error messages if ++something goes wrong. Note, that in the latter case, you get more information from the ++@ref{gui_log, Log Window}. ++ ++@node Media tree ++@subsection Media tree ++ ++@ifhtml ++@image{../img/player_tree_tabbed} ++@end ifhtml ++ ++The media tree can be used to store and organize your media collection. ++It consists of virtual folders called @emph{albums}. You can create albums, ++subalbums and move stuff between them like you want. The media files ++always stay at the same place in the filesystem. The albums can be either ++in own windows (Windowed mode) or as tabs in the tree window (tabbed mode). You ++cah switch this with the right-click menu of the tree widget. ++The tree- and album windows remember their screen positions. ++ ++@menu ++* Tree widget: player_treewidget. ++* Album widget: player_albumwidget. ++@end menu ++ ++@node player_treewidget ++@subsubsection Tree widget ++ ++@b{Doubleclicking} an album opens it if it was closed or vice versa. ++ ++@b{Creating albums} is done by right selecting the parent album in ++the tree and click the ``New album'' button ++@ifhtml ++@image{../img/folder_new_16} ++@end ifhtml ++or ``Album->New'' in the right-click menu. In the new empty album, you can then ++load files or URLs. Another option to import whole directory trees, is to ++click ``Album->New from directory''. It will pop up a directory selection dialog. ++The directory can optionally be scanned recursively. The tracks are either in one ++(flat) album, or in subalbums according to the directory structure. ++Note that importing large directories takes some time. ++ ++@b{Deleting albums} is done by selecting them in the tree and ++clicking the ``remove'' button ++@ifhtml ++@image{../img/trash_16} ++@end ifhtml ++(or by choosing Album->Remove in the right click menu. Please note ++the following: ++ ++@itemize @bullet ++@item Removing albums is done without confirmation ++@item All subalbums are removed as well ++@item This (as well as removing tracks) cannot be undone ++@item Good news: gmerlin @b{never} removes media files from disk ++@end itemize ++ ++@b{Moving albums} is done with Drag & Drop ++ ++@b{Loading files or URLs} into an open or closed album can be done by ++dragging it from a filemanager or webbrowser into the target album in the tree widget. ++ ++Some @b{special albums} are automatically created in addition to the ++regular albums (which are created by you): ++ ++@itemize @bullet ++@item @emph{Incoming:} ++@ifhtml ++@image{../img/incoming_closed_16} ++@end ifhtml ++ ++It's the destination for tracks, which come from ++the comandline or from the remote. ++ ++@item @emph{Favourites:} ++@ifhtml ++@image{../img/favourites_closed_16} ++@end ifhtml ++ ++Each regular album has a Favourites button ++@ifhtml ++@image{../img/favourites_16} ++@end ifhtml ++, which ++lets you copy the selected tracks to the favourites. It's useful for ++quickly making a selection of tracks from multiple different albums. ++ ++@item @emph{Plugin and device albums:} ++@ifhtml ++@image{../img/hardware_16} ++@end ifhtml ++ ++Each plugin, which handles devices like removable disc drives ++@ifhtml ++@image{../img/drive_running_16} ++@end ifhtml ++or tuners ++@ifhtml ++@image{../img/tuner_16} ++@end ifhtml ++will create a plugin album. The available devices are ++then autoscanned and added as subalbums. Device albums are a bit limited: ++You can delete or reorder tracks, but you cannot move tracks from/to other ++albums. ++ ++@end itemize ++ ++@node player_albumwidget ++@subsubsection Album widget ++ ++The album widget can either be in an own window (when the tree is in tabbed mode) ++or in a notebook right of the tree widget. It lists all tracks of that album. ++At the bottom there is a toolbar and a display of the total playback time of the album. ++ ++A @b{track} in gmerlin is a piece of media, which can have an arbitrary number of audio-, ++video- and subtitle @b{streams}. A track can be divided into @b{chapters} (which are just ++seekpoints). Some files (like ALBW wrapped mp3s or concatenated Ogg streams), will show ++up as multiple tracks. You can move them around in the whole tree as if they were separate ++files. ++ ++@b{Doubleclicking} an album opens it if it was closed or vice versa. ++ ++The @b{right click menu} offers lots of options and shortcuts, not all of them are ++documented here. ++ ++@b{Adding tracks} can happen in multiple ways: ++ ++@itemize @bullet ++@item Drag Files or URLs from filenanagers or webbrowsers into an album ++@item Use the buttons ++@ifhtml ++@image{../img/folder_open_16} ++@end ifhtml ++@ifhtml ++@image{../img/earth_16} ++@end ifhtml ++in the album toolbar, or the right click menu ++@end itemize ++ ++@b{Drag and Drop} is supported: ++@itemize @bullet ++@item From most webbrowsers and filenmanagers into the album (see above) ++@item From one regular album to another. By default, tracks are moved. ++ Press the @key{CTRL}-key before dragging, and the tracks will be copied. ++@item Inside all albums to sort the tracks ++@item From an album window into the tree window to transfer tracks to ++ another album ++@item From the album to text editors or graphics programs, which support ++dropping text. You'll get a string representation of the tracks, which ++will make designing disk covers easier. ++@end itemize ++ ++@b{Error tracks} are tracks, which failed to load last time you tried. ++They are marked red but remain in the album. If they are on removable ++disks or in the network, you might retry playing them when they become ++available. To delete all error tracks, go to ``Select error tracks'' in the ++right click menu to select them. Then, press @kbd{@key{CTRL}+DELETE} ++to get rid of them. ++ ++For keyboard commands, see @ref{gmerlin_player_shortcuts, Shortcuts}. ++ ++@node Video window ++@subsection Video window ++ ++This comes only when gmerlin has to show some video or still images. It ++is created and owned by the video output plugin (i.e. it has nothing to ++do with the core GUI). Currently, only an X11 plugin is available. It ++has some special features: You can zoom or squeeze the image to make ++your favourite tradeoff between aspect ratio distortion, black borders ++or cropped images. All global gmerlin @ref{gmerlin_player_shortcuts, Shortcuts} work ++also in the video window, as well as some special ones. ++ ++@node gmerlin_player_trackinfo ++@subsection Track information ++@ifhtml ++@image{../img/player_trackinfo} ++ ++@end ifhtml ++ ++Here, you see detailed information of the currently (or last) played track ++in a tree structure. The right-click menu lets you copy either the whole contents or ++the currently selected row to the clipboard as plain text. ++ ++@node gmerlin_player_avconfig ++@subsection Configuring playback pipelines ++ ++The configuration for audio, video and subtitle handling is almost the same. ++ ++@b{Stream menu} ++ ++For each category, you have a stream menu. ++ ++@ifhtml ++@image{../img/player_avconfig_menu} ++@end ifhtml ++ ++In the upper part, you can select the available streams. ++You can also switch the stream off. ++ ++In the lower part, you can set global (= plugin independent) options ++@ifhtml ++@image{../img/config_16} ++@end ifhtml ++, Filters ++@ifhtml ++@image{../img/filter_16} ++@end ifhtml ++ (See @ref{gui_f, Configuring filters}) ++and the output plugin ++@ifhtml ++@image{../img/plugin_16} ++@end ifhtml ++. ++ ++@b{Output plugin menu} ++ ++@ifhtml ++@image{../img/player_avconfig_plugin} ++@end ifhtml ++ ++In the upper part, you can change the output plugin (even during playback). ++In the lower part, you can configure ++@ifhtml ++@image{../img/config_16} ++@end ifhtml ++the plugin or show information ++@ifhtml ++@image{../img/info_16} ++@end ifhtml ++about the plugin. ++ ++@node gmerlin_player_shortcuts ++@subsection Shortcuts ++ ++The following global shortcuts are available in the main window, the media ++tree including albums and the video window: ++ ++@table @kbd ++@item @key{CTRL}+G ++Pop up current album and goto current track ++ ++@item @key{CTRL}+O ++Pop up preferences dialog ++ ++@item @key{CTRL}+P ++Pop up input plugin dialog ++ ++@item @key{CTRL}+Q ++Quit program ++ ++@item @key{CTRL}+PAGEDOWN ++Goto next track ++ ++@item @key{CTRL}+PAGEUP ++Goto previous track ++ ++@item @key{CTRL}+@key{SHIFT}+PAGEDOWN ++Goto next chapter ++ ++@item @key{CTRL}+@key{SHIFT}+PAGEUP ++Goto previous chapter ++ ++@item @key{CTRL}+RIGHT ++Seek forward ++ ++@item @key{CTRL}+LEFT ++Seek backward ++ ++@item @key{SHIFT}+RIGHT ++Decrease volume ++ ++@item @key{SHIFT}+LEFT ++Increase volume ++ ++@item @key{CTRL}+M ++Toggle mute ++ ++@item 0 ++(Zero) Seek to start. This is not available in the media tree and the albums. ++ ++@item Space ++Toggle pause. This is not available in the media tree and the albums. ++ ++@item @key{CTRL}+G ++Goto current track. This raises the current album and moves to the ++current track within that album. ++ ++@item F9 ++Copy current track to favourites ++ ++@item @key{CTRL}+Q ++Quit gmerlin ++@end table ++ ++The following additional chortcuts are available in the @ref{Video window}: ++ ++@table @kbd ++ ++@item CTRL+PLUS/MINUS ++Increase/decrease aspect ratio (squeeze). Zoom and squeeze are a simple way to choose your ++personal tradeoff between aspect ratio distortion, missing image parts and black borders. ++ ++@item CTRL+MOUSEWHEEL ++Increase/decrease aspect ratio (squeeze). ++ ++@item ALT+PLUS/MINUS ++Increase/decrease zoom factor ++ ++@item ALT+MOUSEWHEEL ++Increase/decrease zoom factor ++ ++@item @key{CTRL}+HOME ++Reset zoom and squeeze ++ ++@item HOME ++Resize the window to the size of the video. If the video has nonsquare ++pixels, the window width is adjustetd accordingly. ++ ++@item @key{SHIFT}+HOME ++Shrink the window such that no black borders are visible abound the video ++ ++@item B/b ++Increase/decrease brightness. ++ ++@item S/s ++Increase/decrease saturation. ++ ++@item C/c ++Increase/decrease contrast. ++ ++Brightness, saturation and contrast work only, if the hardware and the currently used display driver ++support this. ++ ++@item TAB ++Toggle fullscreen/windowed mode ++@item f ++Toggle fullscreen/windowed mode ++@item Esc ++Exit fullscreen mode ++@end table ++ ++The following additional shortcuts are available inside @ref{player_albumwidget, albums}: ++ ++@table @kbd ++@item UP/DOWN ++Move the cursor one track up/down ++ ++@item PAGEUP/PAGEDOWN ++Move the cursor one page up/down ++ ++@item Mousewheel ++Scroll ++ ++@item SHIFT+UP/DOWN ++Move the cursor one track up/down and select track ++ ++@item SHIFT+PAGEUP/PAGEDOWN ++Move the cursor one page up/down and select tracks ++ ++@item @key{CTRL}+UP/DOWN ++Move the cursor one track up/down and unselect track ++ ++@item ALT+HOME ++Move selected tracks to the top ++ ++@item ALT+END ++Move selected tracks to the bottom ++ ++@item ALT+MOUSEWHEEL ++Increase/decrease zoom factor ++ ++ ++@item @key{CTRL}+C ++Copy selected tracks to clipboard ++ ++@item @key{CTRL}+X ++Cut selected tracks to clipboard ++ ++@item @key{CTRL}+V ++Paste tracks from clipboard at the current cursor position ++ ++@item @key{CTRL}+DELETE ++Delete selected tracks ++ ++@item @key{CTRL}+F ++Search for tracks ++ ++@item @key{CTRL}+I ++Display info about the currently selected track ++ ++@item F10 ++Copy selected tracks to favourites ++@end table ++ ++@node Player remote control ++@section Player remote control ++ ++@code{gmerlin_remote} is the command for remotely controlling the ++GUI player. It can be used as a helper application if webbrowsers ++or filenmanagers or for all kinds of remote control methods (including ++keyboard- or infrared-daemons), which can execute arbitrary shell ++commands. One example for a generic keyboard daemon, which can call ++@code{gmerlin_remote} is the @ref{Keyboard daemon, Gmerlin Keyboard daemon}. ++ ++@menu ++* Invoking gmerlin_remote: gmerlin_remote. ++* Examples: gmerlin_remote_examples. ++@end menu ++ ++@node gmerlin_remote ++@subsection Invoking gmerlin_remote ++ ++@include gmerlin_remote.texi ++ ++@node gmerlin_remote_examples ++@subsection Examples ++ ++@table @code ++@item gmerlin_remote -play ++Play the current track (same as pressing the ``play'' button) ++ ++@item gmerlin_remote -host remote.example.com -play ++Connect to @code{remote.example.com} and play the current track there ++ ++@item gmerlin_remote -seek-rel -10.0 ++Seek 10 seconds backwards ++ ++@item gmerlin_remote -next ++Go to next track ++ ++@item gmerlin_remote -chapter + ++Go to next chapter ++ ++@item gmerlin_remote -openplay cda:///dev/scd0 ++Open and play an audio CD in the first SCSI drive and start playing. ++Use commands like this in your desktop configuration for handling removable ++media. ++ ++@item gmerlin_remote -launch -addplay http://webradio.example.com/stream.ogg ++Add the given gml to the Incoming ++@ifhtml ++@image{../img/incoming_closed_16} ++@end ifhtml ++album (launching a new player if necessary) and play it. Use commands like this as ++MIME-Handler in webbrowsers and filemanagers. A shortcut for this command is the ++script ++@code{gmerlin_launcher}. ++@end table ++ ++ ++@node GUI Transcoder ++@section GUI Transcoder ++ ++@menu ++* Invoking gmerlin_transcoder: gmerlin_transcoder. ++* Quick intro: gmerlin_transcoder_intro. ++* Main window: gmerlin_transcoder_window. ++* Configuring encoder plugins: gmerlin_transcoder_enc. ++* Configuring tracks: gmerlin_transcoder_tracks. ++@end menu ++ ++@node gmerlin_transcoder ++@subsection Invoking gmerlin_transcoder ++ ++@include gmerlin_transcoder.texi ++ ++@node gmerlin_transcoder_intro ++@subsection Quick intro ++ ++Gmerlin transoder can transcode every supported input file ++to any of the supported output files. It has some unique features, ++which seperate it from other transcoding applications. Most notably: ++ ++@table @b ++@item Per stream settings ++All settings are configured for each stream separately. This means, ++different streams can have different formats, different filters and ++even different codecs (of course only if the container supports it) ++ ++@item Subtitle support ++There are plugins for exporting subitles to separate files or to the ++same file, where the A/V data gets written. Alternatively, you can ++blend subtitles onto the video frames (for containers, which don't ++support subtitles). ++ ++@item Profile support ++Finding out the right encoder parameters can be a time-consuming task. ++@code{gmerlin_transcoder} allows you to save all settings and load them later. ++Once you have found out your favourite encoder settings for a specific task, ++transcoding is a matter of ++@itemize @bullet ++@item Loading the profile ++@item Adding tracks to the tasklist ++@item Clicking the transcode button ++@end itemize ++ ++@item Postprocessing support ++There are postprocessors, which take the encoded files and ++make e.g. Audio CDs (with cdtext) from it. It also contains a frontend for cdrdao, ++so you can burn them as well. ++ ++@item Chapter support ++@code{gmerlin_transcoder} imports all chapter seekpoints from the source, and writes ++them into the file (currently only supported for Quicktime and mp4). ++You can also edit chapter lists or create new ones ++@item Language codes ++@code{gmerlin_transcoder} lets you import, edit and export language codes for ++the Audio- and subtitle streams ++@item 2 Pass encoding ++For plugins, which support it, we can do 2-transcoding. There is also a ++generic volume normalizer built in. ++@end table ++ ++There is a @ref{transcoder_tasklist, tasklist}, ++in which the tracks are queued. All newly loaded tracks ++get the globally configured settings (plugins, formats, filters). You can then ++fine-tune the tracks by configuring them individually. Changing track ++parameters for multiple tracks at once isn't possible. Instead, make the ++settings, save them to a profile and load the profile before loading the ++tracks. ++ ++@node gmerlin_transcoder_window ++@subsection Main window ++ ++@ifhtml ++@image{../img/transcoder_mainwin} ++@end ifhtml ++ ++The window contains of the following elements: ++ ++@menu ++* Menu bar: transcoder_menubar. ++* Display: transcoder_display. ++* Progress bar: transcoder_progressbar. ++* Tasklist: transcoder_tasklist. ++@end menu ++ ++@node transcoder_menubar ++@subsubsection Menu bar ++ ++Here you have all @b{global} commands and settings. ++The item @b{Tasklist} has @b{per track} commands and settings. ++ ++@b{File menu} ++ ++@table @b ++@item Load tasklist... ++@ifhtml ++@image{../img/folder_open_16} ++@end ifhtml ++Pops up a file selection dialog and loads the chosen tasklist. ++The tracks are appended to already existing tracks in the list. ++Has a shortcut in the @b{upper} toolbar. ++@item Save tasklist... ++@ifhtml ++@image{../img/save_16} ++@end ifhtml ++Pops up a file selection dialog for saving the current tasklist. ++Has a shortcut in the @b{upper} toolbar. ++@item Quit ++@ifhtml ++@image{../img/quit_16} ++@end ifhtml ++Stop the current transcoding action (if any) and quit ++Has a shortcut in the @b{upper} toolbar. ++@end table ++ ++@b{Options menu} ++@table @b ++@item Preferences ++@ifhtml ++@image{../img/config_16} ++@end ifhtml ++Here, you configure the GUI and the default settings for newly added tracks. ++The preferences are saved in the profile. ++ ++@item Configure plugins ++@ifhtml ++@image{../img/plugin_16} ++@end ifhtml ++Here, you set the default plugins for newly added tracks. You can ++configure input plugins (See @ref{gui_i, Configuring input plugins}) ++and encoders (See @ref{gmerlin_transcoder_enc, Configuring encoders}). ++The plugin settings are saved in the profile. ++ ++@item Load profile... ++@ifhtml ++@image{../img/folder_open_16} ++@end ifhtml ++Pops up a file selection dialog and loads the chosen profile. ++All configuration and plugin settings for new tracks will be ++changed immediately. ++@item Save profile... ++@ifhtml ++@image{../img/save_16} ++@end ifhtml ++Pops up a file selection dialog for saving the current configuration ++to a profile. ++ ++@end table ++ ++@b{Actions} ++ ++@table @b ++@item Start transcoding ++@ifhtml ++@image{../img/run_16} ++@end ifhtml ++This will start transcoding of the tracks in the trasklist in top-to-bottom ++order. While transcoding you can still add/delete/edit tracks in the list. ++Has a shortcut in the @b{upper} toolbar. ++@item Stop transcoding ++@ifhtml ++@image{../img/stop_16} ++@end ifhtml ++Stops transcoding. If the currently transcoded track is not a ++live stream, the produced files are deleted from disk (unless you disable ++this in the preferences). The currently decoded track is moved back to the ++top of the tasklist. ++Has a shortcut in the @b{upper} toolbar. ++@end table ++ ++@b{Tasklist} ++ ++This menu acts on the tasklist as a whole or the selected track(s). ++ ++@table @b ++@item Add... -> Files... ++@ifhtml ++@image{../img/folder_open_16} ++@end ifhtml ++Pops up a file selection dialog, which lets you add files (optionally ++with a specific input plugin) to the end of the tasklist. ++Has a shortcut in the @b{lower} toolbar. ++@item Add... -> URLs... ++@ifhtml ++@image{../img/earth_16} ++@end ifhtml ++Pops up a window, which lets you enter an URL (optionally ++with a specific input plugin) to the end of the tasklist. ++Has a shortcut in the @b{lower} toolbar. ++@item Add... -> Drives... ++@ifhtml ++@image{../img/drive_running_16} ++@end ifhtml ++Pops up a window, which lets open a removeable disk (e.g. ++and Audio CD) and append it's tracks to the end of the ++tasklist. You must specify the device @b{and} the plugin. ++Has a shortcut in the @b{lower} toolbar. ++@item Selected... -> Move up... ++@ifhtml ++@image{../img/top_16} ++@end ifhtml ++Move the selected tracks to the top of the list, so they will be ++transcoded first. ++@item Selected... -> Move down... ++@ifhtml ++@image{../img/down_16} ++@end ifhtml ++Move the selected tracks to the bottom of the list, so they will be ++transcoded last ++@item Selected... -> Remove... ++@ifhtml ++@image{../img/trash_16} ++@end ifhtml ++Remove the selected tracks (without confirmation or undo). ++Has a shortcut in the @b{lower} toolbar. ++@item Selected... -> Configure... ++@ifhtml ++@image{../img/config_16} ++@end ifhtml ++Configure the selected track. ++Has a shortcut in the @b{lower} toolbar. ++@item Selected... -> Edit chapters... ++@ifhtml ++@image{../img/chapter_16} ++@end ifhtml ++Pop up the chapter editor. If the source has chapters, you'll ++find them here. You can also add/delete/move chapters. Chapters ++can also have names (currently only supported by the libquicktime encoder). ++Has a shortcut in the @b{lower} toolbar. ++ ++@item Selected... -> Change encoders... ++@ifhtml ++@image{../img/plugin_16} ++@end ifhtml ++Here, you set the encoding plugins of the selected tracks. ++(See @ref{gmerlin_transcoder_enc, Configuring encoders}). ++Has a shortcut in the @b{lower} toolbar. ++ ++@item Edit... -> Cut ++@ifhtml ++@image{../img/cut_16} ++@end ifhtml ++Cut selected tracks to the clipboard. ++Has a shortcut in the @b{lower} toolbar. ++ ++@item Edit... -> Copy ++@ifhtml ++@image{../img/copy_16} ++@end ifhtml ++Copy selected tracks to the clipboard. ++Has a shortcut in the @b{lower} toolbar. ++ ++@item Edit... -> Paste ++@ifhtml ++@image{../img/paste_16} ++@end ifhtml ++Paste tracks or album entries from the @ref{GUI Player} ++from the clipboard. Has a shortcut in the @b{lower} toolbar. ++@item Postprocess... ++Pops up a dialog to configure postprocessing. ++Postprocessing plugins are invoked whenever ++the tasklist gets empty. It adds all tracks, which have ++been encoded since batch transcoding was started. ++Postprocessors make some sanity checks of the files they get, ++and won't try to burn e.g. audio CDs with MPEG data. ++@end table ++ ++@b{Windows} ++ ++Here, you can show and hide the @ref{gui_log, log window}. ++ ++@node transcoder_display ++@subsubsection Display ++Displays the currently performed action and the estimated ++remaining time for the current action. The time display in the lower right ++corner shows the total playback time of the tasklist. ++ ++@node transcoder_progressbar ++@subsubsection Progress bar ++Displays the progress of the current action. ++ ++@node transcoder_tasklist ++@subsubsection Tasklist ++ ++A queue for tracks to be transcoded. Right clicking into the ++list pops up a menu, which is the same as in the menubar. ++ ++New tracks can be added in various ways: ++ ++@itemize @bullet ++@item By dragging files or URLs from filenanagers or webbrowsers into the tasklist ++@item By using the buttons in lower toolbar or the right click menu ++@item From the @ref{GUI Player} by right clicking into an album end select Selected->Transcode. If multiple transcoders are open, the ++instance, which listens on the remote port (can be only one at a time), ++gets the track. ++@item By dragging tracks from a gmerlin album into the tasklist ++@end itemize ++ ++@node gmerlin_transcoder_enc ++@subsection Configuring encoders ++@ifhtml ++@image{../img/transcoder_enc} ++@end ifhtml ++ ++This dialog exists in the global settings as well as in the per track ++settings. It describes a complete encoder setup. ++ ++There are 2 different modes for encoding: Either all A/V streams go into ++one file, or into separate files (i.e. it's not possible to group some ++A/V streams and write others separately). You control this by clicking ++``Encode audio into video file'' checkbox. Subtitles can be written into ++the video file, or into a separate file. You can select this independently for ++text- and overlay subtitles with the corresponding checkbuttons. ++ ++Note, that some streams are always written to a separate file (regardless ++of the check-box settings) if the video encoder plugin doesn't support streams ++of that type. ++ ++Then, you can set encoder plugins for each stream type. The menu selects ++the plugin. Right of the menu, there are buttons for displaying plugin info ++@ifhtml ++@image{../img/info_16} ++@end ifhtml ++and setting global options ++@ifhtml ++@image{../img/config_16} ++@end ifhtml ++(like ID3 generation or fileformat flavours). These settings can be changed ++on a per track basis in the @ref{gmerlin_transcoder_tracks, ++ track configuration dialog}. ++ ++Finally, there are the default audio- ++@ifhtml ++@image{../img/audio_16} ++@end ifhtml ++and video ++@ifhtml ++@image{../img/video_16} ++@end ifhtml ++settings. Here, you mostly configure codec parameters like bitrates, etc. ++To further tweak these settings of a per stream base, you'll find the ++same options for each stream in the @ref{gmerlin_transcoder_tracks, ++ track configuration dialog}. ++ ++@node gmerlin_transcoder_tracks ++@subsection Configuring tracks ++@ifhtml ++@image{../img/transcoder_track} ++@end ifhtml ++ ++It's a standard gmerlin configuration dialog, which is built dynamically ++depending on the stream layout of the source and the encoder setup. On ++the left you see a tree structure of all settings: ++@table @b ++@item General ++Sets global settings like basename of the file and an optional subdirectory ++of the encoding directory, where the file(s) will be written. Note, that ++the toplevel destination directory is configured globally, not per track. ++ ++If you select ``postprocess only'', the input file will be sent directly ++to the postprocessing plugin. Enable this for files, which already have a ++format supported by the postprocessor. ++ ++Finally you can choose to transcode only a certain selection given by ++the start- and/or end time. ++ ++@item Metadata ++Here, any available metadata are imported from the input, and you can ++edit them. Note that not all medatada fields are supported by all output ++formats. Some formats don't support metadata at all. ++ ++@item Global encoder options ++For each enabled encoding plugin, you can configure global settings here. ++ ++@item Stream options ++For each stream, you have @b{Generic options}. Here you can en- or disable ++the stream, set the language and the format. In addition for subtitles, ++you can choose whether to convert text- to overlay subtitles, blend ++subtitles onto video frames or encode them separately. ++ ++For Audio and video streams, you can also set up @ref{gui_f, filters}. ++ ++For text subtitles, the @b{render options} let you configure the ++font and colors of the subtitles, if they are converted to overlay ++subtitles. ++ ++The @b{default format} of subtitles is for the rare case, that you want ++to convert subtitles to a video stream. It's only used if you encode subtitles ++but no corresponding video stream. ++ ++The last tree- node for each stream has always the codec option of the ++output plugin for the respective streams. Here, you can change encoder ++settings for each stream separately. ++@end table ++ ++@node Transcoder remote control ++@section Transcoder remote control ++ ++@menu ++* Invoking gmerlin_transcoder_remote: gmerlin_transcoder_remote. ++@end menu ++ ++@node gmerlin_transcoder_remote ++@subsection Invoking gmerlin_transcoder_remote ++ ++@include gmerlin_transcoder_remote.texi ++ ++ ++@node Commandline player ++@section Commandline player ++ ++@menu ++* Invoking gmerlin_play: gmerlin_play. ++@end menu ++ ++@node gmerlin_play ++@subsection Invoking gmerlin_play ++ ++@include gmerlin_play.texi ++ ++@node Commandline recorder ++@section Commandline recorder ++ ++@menu ++* Invoking gmerlin-record: gmerlin-record. ++@end menu ++ ++@node gmerlin-record ++@subsection Invoking gmerlin-record ++ ++@include gmerlin_record.texi ++ ++@node Alsamixer ++@section Alsamixer ++ ++@ifhtml ++@image{../img/alsamixer} ++@end ifhtml ++ ++Type @code{gmerlin_alsamixer} to start this. ++This is a mixer program, which is still convenient, if you have ++multiple soundcards with 100s of options each. It provides widgets ++for almost all soundcard parameters, which are supported by alsa. ++ ++By right clicking on a control, you get a menu where you can: ++ ++@itemize @bullet ++@item Move controls inside the window ++@ifhtml ++@image{../img/first_16} ++@image{../img/left_16} ++@image{../img/right_16} ++@image{../img/last_16} ++@end ifhtml ++ ++@item Move controls to own windows ++@ifhtml ++@image{../img/windowed_16} ++@end ifhtml ++. To move them back to main window, ++ simply close the control-windows. ++@item Pop up an options dialog ++@ifhtml ++@image{../img/config_16} ++@end ifhtml ++, where you can select which controls should be shown at all. ++@end itemize ++ ++All window configurations and coordinates are remembered. The actual mixer ++settings are @emph{not} remembered, since this is done globally by the ++Alsa startup scripts. ++ ++@node Visualizer ++@section Visualizer ++ ++@ifhtml ++@image{../img/visualizer} ++ ++@end ifhtml ++ ++Type @code{gmerlin_visualizer} to start this. ++Gmerlin visualizer opens your soundard for recording and displays a ++visualization in a window. It supports fullscreen and mouse- and ++keyboard interaction with visuals for visualization plugins, which ++support this. ++If you move the mouse or press the ``Menu key'', the toolbar will show ++up (either method can be disabled). It will be hidden again after ++the mouse is idle for some seconds. ++ ++In the @b{upper left row}, you can change the input plugin, show info ++about the plugin ++@ifhtml ++@image{../img/info_16} ++@end ifhtml ++or configure the visualization ++@ifhtml ++@image{../img/config_16} ++@end ifhtml ++. ++ ++In the @b{lower left row}, you can change the recording- and ++display plugins ++@ifhtml ++@image{../img/plugin_16} ++@end ifhtml ++, set global (plugin independent) options ++@ifhtml ++@image{../img/config_16} ++@end ifhtml ++, restart the visualization ++@ifhtml ++@image{../img/refresh_16} ++@end ifhtml ++, switch to fullscreen ++@ifhtml ++@image{../img/fullscreen_16} ++@end ifhtml ++or back ++@ifhtml ++@image{../img/windowed_16} ++@end ifhtml ++. Moreover you can show or hide the @ref{gui_log, Log window} ++@ifhtml ++@image{../img/log_16} ++@end ifhtml ++or exit ++@ifhtml ++@image{../img/quit_16} ++@end ifhtml ++the application. ++ ++The @b{VU-meter} at the right displays the recording level as it comes ++from the device (i.e. @b{before} the visualizer gain is applied). ++ ++You have the following @b{Shortcuts}: ++ ++@table @kbd ++@item f ++Toggle fullscreen mode ++@item Tab ++Toggle fullscreen mode ++@item Escape ++Exit fullscreen mode ++@item Menu ++Show toolbar ++@end table ++ ++All other keyboard- and mouse events are propagated to the display ++plugin and then to the visualization plugin. ++ ++@node Keyboard daemon ++@section Keyboard daemon ++@ifhtml ++@image{../img/kbd_mainwin} ++ ++@end ifhtml ++The gmerlin keyboard daemon is an X11 application, which grabs key combinations ++and executes commands. You will communicate mostly via ++the configuration utility @code{gmerlin_kbd_config}. It's independent of ++keyboard model definitions, because it allows to enter the keyboard combination ++in the config dialog directly. It's independent of gmerlin or any other ++multimedia architecture, since the actions can be arbitrary shell commands. ++ ++You can manually start and stop the keyboard daemon, add, edit and delete ++key combinations and tell the daemon to apply the changes. ++ ++To automatically start the keyboard daemon at each X11 start, find out ++where to enter start commands in your desktop configuration add the ++command @code{/usr/local/bin/gmerlin_kbd}. Change @code{/usr/local} to ++your install prefix if necessary. ++ ++Messages from the keyboard daemon show up in @file{/var/log/messages} or ++in another syslog file depending on your system setup. ++ ++@node Plugins, FAQ, Applications, Top ++@chapter Plugins ++ ++@include plugins.texi ++ ++@node FAQ, Get involved, Plugins, Top ++@chapter FAQ ++ ++@menu ++* General questions:: ++* Installation questions:: ++* Usage questions:: ++@end menu ++ ++@node General questions ++@section General questions ++ ++@node Installation questions ++@section Installation questions ++ ++@strong{Q:} @emph{Why do I have to install so many packages to get all features?} ++ ++@strong{A:} Because having one huge package is not good for people, who want to use ++only one small subset of the included libraries or applications. To make installation ++a bit easier, there are the gmerlin-dependencies and gmerlin-all-in-one packages. ++ ++@strong{Q:} @emph{How do I enable Ladspa plugins?} ++ ++@strong{A:} Gmerlin looks for Ladspa plugins in @code{/usr/lib/ladspa} and ++@code{/usr/local/lib/ladspa} by default. Additional paths can be set with the ++@code{LADSPA_PATH} enviromnent variable. ++ ++@strong{Q:} @emph{Which Ladspa plugins work with gmerlin?} ++ ++@strong{A:} All plugins, which have either 1 or 2 input and output ports. The numbers ++of input- and output ports must be equal. ++ ++@strong{Q:} How do I enable DVB? ++ ++@strong{A:} Gmerlin looks for DVB devices in /dev/dvb. Then, you must pass gmerlin ++ a channel configuration file created with the @uref{http://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps,dvb-apps} ++ tools. Check the documentation coming with dvb-apps for how to create channel files. Gmerlin looks for channel maps ++ in the directories @code{$HOME/.szap}, @code{$HOME/.tzap}, @code{$HOME/.czap}, ++ @code{$HOME/.azap}, @code{$HOME/.mplayer} and @code{$HOME/.xine}. The first time, you load the DVB plugin, ++ and each time you changed your channel map, the plugin will tune to each transponder and get the full ++ information about the programs (the information provided by dvp-apps is not sufficient). This can take some time. ++ ++@node Usage questions ++@section Usage questions ++ ++@strong{Q:} @emph{Ok, I compiled gmerlin and started the player, now how do I play a file?} ++ ++@strong{A:} The easiest way is to open the Incoming or Favourites album ++and use one of the buttons at the bottom to open a file or URL. Or drag the ++file from a filemanager into an album. Later you might want to create ++your own albums. ++ ++@strong{Q:} @emph{Can I play a VCD image from harddisk before burning?} ++ ++@strong{A:} Yes. If you use vcdimager, you have 2 files: a .bin file and a .cue ++ file. If you load the .cue file with the avdecoder plugin, you'll be ++ able to play the VCD image. ++ ++@strong{Q:} @emph{Can I play a DVD image from harddisk or from a mounted DVD drive?} ++ ++@strong{A:} Yes, in the dvd directory, go to the subdirectory @code{video_ts} and load the ++ file @code{video_ts.ifo}. ++ ++@strong{Q:} @emph{Can I play an audio CD image from harddisk before burning?} ++ ++@strong{A:} Not yet. ++ ++@strong{Q:} @emph{How can I make gmerlin the default audio CD player on my Desktop environment?} ++ ++@strong{A:} First, find out how to configure the default audio CD player on your system. ++ Usually, you can set a command, which is executed, when a new audio cd is inserted. ++ Assuming your cdrom device is @code{/dev/hdd}, the command for opening and playing ++ an audio cd is: ++ ++ @code{gmerlin_remote -launch -openplay cda:///dev/hdd} ++ ++ If you just want ot open the CD (without starting playback), use: ++ ++ @code{gmerlin_remote -launch -open cda:///dev/hdd} ++ ++@strong{Q:} @emph{How can I make gmerlin the default DVD player on my Desktop environment?} ++ ++@strong{A:} Same as for audio CDs, but replace @code{cda://} with @code{dvd://}. ++ ++@strong{Q:} @emph{How can I configure gmerlin as a Mime handler for media files on my Desktop environment?} ++ ++@strong{A:} Find out how to set up mime handlers (e.g. right click onto a file and select ``Open with...''). ++ Then, enter the command @code{gmerlin_launcher}. ++ ++@strong{Q:} @emph{How can I map multimedia keys on my keyboard to gmerlin functions?} ++ ++@strong{A:} You need some way to configure custom shell commands for multimedia keys. Check the ++documentation of your Desktop system. To remote control gmerlin, use the commandline program ++@code{gmerlin_remote}. Type @code{gmerlin_remote -help} for supported options and commands. ++ ++@node Get involved, , FAQ, Top ++@chapter Get involved ++ ++Contribution to gmerlin can happen at several skill levels: ++ ++@itemize @bullet ++@item Report bugs and installation problems, tell about features you'd like to see. ++@item Tell us about files, which cannot be played. An URL and some infos (other applications ++ which play the file fine) can help a lot. ++@item Make skins. In /usr/local/gmerlin/skins/Default/skin.xml, you'll find an example skin description file. ++@item Assembler gurus can write more speed optimized routines for gavl ++@item Mathematics gurus can write more accurate routines for the higher quality ++levels of gavl. ++@end itemize ++ ++@bye ++ +diff -Naur gmerlin-1.2.0.orig/doc/gmerlin.texi gmerlin-1.2.0/doc/gmerlin.texi +--- gmerlin-1.2.0.orig/doc/gmerlin.texi 2013-02-27 16:56:41.202827892 -0800 ++++ gmerlin-1.2.0/doc/gmerlin.texi 2013-02-27 16:58:29.743890528 -0800 +@@ -461,7 +461,7 @@ + + A gml can be: + +-@table @bullet ++@table @b + @item A regular filename + Optionally preceeded with ``file://''. This means, that @b{/files/music.mp3} is the same as + @b{file:///files/music.mp3}. diff --git a/community/gpsmanshp/PKGBUILD b/community/gpsmanshp/PKGBUILD index a34ddd3a9..4b5e2a62f 100644 --- a/community/gpsmanshp/PKGBUILD +++ b/community/gpsmanshp/PKGBUILD @@ -1,6 +1,5 @@ -# $Id: PKGBUILD 81604 2012-12-25 00:34:09Z foutrelis $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org +# $Id: PKGBUILD 85511 2013-03-02 09:50:49Z cinelli $ +# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> pkgname=gpsmanshp pkgver=1.2.1 @@ -10,28 +9,27 @@ arch=('i686' 'x86_64') url="http://gpsmanshp.sourceforge.net/" license=('GPL') depends=('glibc' 'shapelib' 'tcl') -source=("http://sourceforge.net/projects/${pkgname}/files/distr/${pkgname}_${pkgver}.tgz") +source=("http://sourceforge.net/projects/$pkgname/files/distr/${pkgname}_$pkgver.tgz") md5sums=('c2876d7f67c8215b46b336b5b859d49f') build() { - cd "${pkgname}_${pkgver}" + cd "${pkgname}_$pkgver" mv Makefile8.5 Makefile sed -i -e "s:shapefil.h:libshp/shapefil.h:g" gpsmanshp.c - install -d ${pkgdir}/usr/lib/ + install -d "$srcdir/${pkgname}_$pkgver/usr/lib/" - # set install path - sed -i -e "s|/usr/lib/tcl\$(TCLVERSION)|${pkgdir}/usr/lib/gpsmanshp|g" Makefile + sed -i -e "s|/usr/lib/tcl\$(TCLVERSION)|$srcdir/${pkgname}_$pkgver/usr/lib/gpsmanshp|g" Makefile sed -i -e "s|tclsh\$(TCLVERSION)|tclsh|g" Makefile sed -i "s|package-8.3.tcl|/usr/lib/tcl8.6/package.tcl|g" Makefile sed -i "s|8.4|8.6|g" Makefile - + make } package() { - cd "${pkgname}_${pkgver}" + cd "${pkgname}_$pkgver" make install } diff --git a/community/ifuse/PKGBUILD b/community/ifuse/PKGBUILD index bcdf2b502..0cb379485 100644 --- a/community/ifuse/PKGBUILD +++ b/community/ifuse/PKGBUILD @@ -1,5 +1,6 @@ -# $Id: PKGBUILD 74618 2012-07-31 19:56:08Z ebelanger $ -# Maintainer: Thomas Dziedzic < gostrc at gmail > +# $Id: PKGBUILD 85492 2013-03-02 02:11:04Z cinelli $ +# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> +# Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=ifuse @@ -10,17 +11,17 @@ url='http://libimobiledevice.org/' arch=('i686' 'x86_64') license=('LGPL2.1') depends=('libimobiledevice' 'fuse') -source=("http://www.libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2") +source=("http://www.libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2") md5sums=('4152526b2ac3c505cb41797d997be14d') build() { - cd "${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr make } package() { - cd "${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/community/kcm-fcitx/PKGBUILD b/community/kcm-fcitx/PKGBUILD index e3ba19b79..2840f768e 100644 --- a/community/kcm-fcitx/PKGBUILD +++ b/community/kcm-fcitx/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 82954 2013-01-26 06:35:46Z fyan $ +# $Id: PKGBUILD 85498 2013-03-02 02:59:40Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: poplarch <poplarch@gmail.com> pkgname=kcm-fcitx pkgver=0.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Config Module for Fcitx" arch=('i686' 'x86_64') url="https://github.com/fcitx/kcm-fcitx" license=('GPL') -depends=('fcitx>=4.2.7' 'kdebase-runtime' 'fcitx-qt') +depends=('fcitx>=4.2.7' 'kdebase-runtime' 'fcitx-qt4') makedepends=('cmake' 'automoc4') source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") @@ -19,7 +19,7 @@ build() { mkdir -p build cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DQT_QMAKE_EXECUTABLE=qmake-qt4 .. make } diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD index 0bf41a260..2ca7ffe45 100644 --- a/community/scite/PKGBUILD +++ b/community/scite/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83608 2013-02-03 22:48:31Z arodseth $ +# $Id: PKGBUILD 85517 2013-03-02 12:31:53Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.com> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=scite -pkgver=3.2.4 +pkgver=3.2.5 pkgrel=1 pkgdesc='Editor with facilities for building and running programs' arch=('x86_64' 'i686') @@ -17,7 +17,7 @@ makedepends=('setconf') backup=('usr/share/scite/SciTEGlobal.properties') install=$pkgname.install source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//./}.tgz") -sha256sums=('bd20b97513aee8e4584253d6ca31ec658bd4f098ceefb354889eb8a498cb5c08') +sha256sums=('ac3ca9588bb23ef21da2e22f6ef21416bbd7bf6957130a8e4057b3e5f3c58bef') build() { cd "$srcdir" diff --git a/community/smc/PKGBUILD b/community/smc/PKGBUILD index d4914592e..b22911859 100644 --- a/community/smc/PKGBUILD +++ b/community/smc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 83276 2013-01-28 16:50:11Z stephane $ -# Maintainer: +# $Id: PKGBUILD 85525 2013-03-02 19:49:53Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=smc pkgver=1.9 -pkgrel=18 +pkgrel=19 pkgdesc="Secret Maryo Chronicles" arch=('i686' 'x86_64') url="http://www.secretmaryo.org/" diff --git a/community/teamspeak3/PERMISSION.eml b/community/teamspeak3/PERMISSION.eml new file mode 100644 index 000000000..34ab6fedb --- /dev/null +++ b/community/teamspeak3/PERMISSION.eml @@ -0,0 +1,70 @@ +Return-Path: <bizdev@teamspeakusa.com>
+X-Original-To: sh@lutzhaase.com
+Delivered-To: sh@lutzhaase.com
+Received: from tritoncia.com (mail.tritoncia.com [50.22.6.155])
+ by lutzhaase.com (Postfix) with ESMTP id 4066410001D
+ for <sh@lutzhaase.com>; Wed, 27 Feb 2013 22:41:21 +0100 (CET)
+Received: from support.teamspeakusa.com ([50.22.6.158])
+ by tritoncia.com (tritoncia.com [127.0.0.1])
+ (MDaemon PRO v12.5.2)
+ with ESMTP id md50001207881.msg
+ for <sh@lutzhaase.com>; Wed, 27 Feb 2013 15:41:14 -0600
+X-Spam-Processed: tritoncia.com, Wed, 27 Feb 2013 15:41:14 -0600
+ (not processed: spam filter heuristic analysis disabled)
+X-MDRemoteIP: 50.22.6.158
+X-Return-Path: bizdev@teamspeakusa.com
+X-Envelope-From: bizdev@teamspeakusa.com
+X-MDaemon-Deliver-To: sh@lutzhaase.com
+Message-ID: <1362001813.512e7f9544c05@support.teamspeakusa.com>
+Date: Wed, 27 Feb 2013 22:50:13 +0100
+Subject: [#DYK-534-32625]: Redistribution for Arch Linux
+From: TeamSpeak Business Development <bizdev@teamspeakusa.com>
+Reply-To: bizdev@teamspeakusa.com
+To: sh@lutzhaase.com
+MIME-Version: 1.0
+Content-Type: text/html; charset=utf-8
+Content-Transfer-Encoding: quoted-printable
+X-Priority: 3 (Normal)
+
+<font face=3D"Candara, Verdana, Arial, Helvetica" size=3D"3">Hi Sven,<br=
+ />
+<br />
+as long as our licenses remain included and the binari=
+es remain unchanged we are approving a packaging of the TeamSpeak 3 soft=
+ware in your Arch Linux project.<br />
+<br />
+Best regards<br />=
+
+<br />
+Andreas Brillen<br />
+<br />_____________________=
+___________<br />
+TeamSpeak Business Development<br />
+e-Mail: b=
+izdev@teamspeakusa.com<br />
+Visit: http://www.TeamSpeak.com<br =
+/>
+Customers: https://sales.TeamSpeakUSA.com<br />
+Knowledgebase=
+: http://support.TeamSpeakUSA.com<br />
+<br />
+Hours of operation=
+ for this department are Monday - Friday, 9AM to 5PM Pacific Time (UTC-8=
+) and 9AM to 4PM CET (UTC+1). We are committed to responding to your inq=
+uiry within 48 hours, and typically will reply within 24 hours, excludin=
+g weekends and holidays.<br />
+<br /><br />
+
+
+Ticket De=
+tails<br />
+<hr style=3D"margin-bottom: 6px; height: 1px; BORDER: n=
+one; color: #cfcfcf; background-color: #cfcfcf;" />
+Ticket ID: DYK-53=
+4-32625<br />
+Department: Business Development<br />
+Type: Issue=
+<br />
+Status: <font color=3D"#333333">Open</font><br />
+</font>
+
diff --git a/community/teamspeak3/PKGBUILD b/community/teamspeak3/PKGBUILD index 7b3038d0e..7e8ebce77 100644 --- a/community/teamspeak3/PKGBUILD +++ b/community/teamspeak3/PKGBUILD @@ -4,20 +4,22 @@ pkgname=teamspeak3 pkgver=3.0.9.2 -pkgrel=3 +pkgrel=4 pkgdesc="TeamSpeak is software for quality voice communication via the Internet" url="http://www.teamspeak.com/" license=('custom') depends=('qt4' 'libpulse') arch=('i686' 'x86_64') source=("http://teamspeak.gameserver.gamed.de/ts3/releases/${pkgver}/TeamSpeak3-Client-linux_x86-${pkgver}.run" - 'teamspeak3.desktop' 'icon.xpm' 'teamspeak3.launcher') + 'teamspeak3.desktop' + 'icon.xpm' + 'teamspeak3.launcher') md5sums=('b9ca1362f6f79644357c5558ee5ddfd2' - 'be58a8798c5d1b7e95a89f6a6482db3e' - '19f103384e4c1a0aafc8fed44de0c87b' - '170fcbb1b468ce4f3dba7ee3fb2a1c6d') -_TSARCH='x86' + '98e987a42511f159fa2228f5e0bffed1' + '19f103384e4c1a0aafc8fed44de0c87b' + '170fcbb1b468ce4f3dba7ee3fb2a1c6d') +_TSARCH='x86' if [ "$CARCH" == "x86_64" ]; then source[0]="http://teamspeak.gameserver.gamed.de/ts3/releases/${pkgver}/TeamSpeak3-Client-linux_amd64-${pkgver}.run" md5sums[0]='a15002b92e3cd4585dc9ce07818bf446' diff --git a/community/teamspeak3/teamspeak3.desktop b/community/teamspeak3/teamspeak3.desktop index d3f9fac3f..da6ef5472 100644 --- a/community/teamspeak3/teamspeak3.desktop +++ b/community/teamspeak3/teamspeak3.desktop @@ -3,8 +3,8 @@ Encoding=UTF-8 Name=TeamSpeak 3 GenericName=TeamSpeak Comment=TeamSpeak is software for quality voice communication via the Internet -Exec=/usr/bin/teamspeak3 -Icon=/usr/share/pixmaps/teamspeak3.xpm +Exec=teamspeak3 +Icon=teamspeak3.xpm StartupNotify=true Terminal=false Type=Application diff --git a/community/torsocks/PKGBUILD b/community/torsocks/PKGBUILD new file mode 100644 index 000000000..6e6d3484f --- /dev/null +++ b/community/torsocks/PKGBUILD @@ -0,0 +1,48 @@ +# Maintainer: Daniel Micay <danielmicay@gmail.com> +# Contributor: Nicolas Pouillard <nicolas.pouillard@gmail.com> +# Contributor: Rorschach <r0rschach@lavabit.com> + +pkgname=torsocks +pkgver=1.3 +pkgrel=3 +pkgdesc='Wrapper to safely torify applications' +arch=('i686' 'x86_64') +url='http://code.google.com/p/torsocks' +license=('GPL2') +depends=('tor') +makedepends=('git') +options=(!libtool) +backup=("etc/${pkgname}.conf") + +__gitroot=https://git.torproject.org/torsocks +__gitname=torsocks + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [[ -d "$__gitname" ]]; then + cd "$__gitname" && git pull origin + msg "The local files are updated." + else + git clone "$__gitroot" "$__gitname" + fi + + msg "GIT checkout done or server timeout" + msg "Starting build..." + + rm -rf "$srcdir/$__gitname-build" + git clone "$srcdir/$__gitname" "$srcdir/$__gitname-build" + cd "$srcdir/$__gitname-build" + + git checkout $pkgver + + ./autogen.sh + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd "$srcdir/$__gitname-build" + make DESTDIR="$pkgdir/" install +} diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD index b75cd8b0e..b1efde3df 100644 --- a/community/virtualbox-modules-lts/PKGBUILD +++ b/community/virtualbox-modules-lts/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 82760 2013-01-23 21:19:41Z bpiotrowski $ +# $Id: PKGBUILD 85478 2013-03-02 00:44:06Z seblu $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Ionut Biru <ibiru@archlinux.org> -# Contributor: Sébastien Luttringer <seblu@aur.archlinux.org> +# Contributor: Sébastien Luttringer pkgbase=virtualbox-modules-lts pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts') -pkgver=4.2.6 -pkgrel=5 +pkgver=4.2.8 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/community/virtualbox-modules-lts/build.sh b/community/virtualbox-modules-lts/build.sh index 961a6afab..744f18330 100755 --- a/community/virtualbox-modules-lts/build.sh +++ b/community/virtualbox-modules-lts/build.sh @@ -1,18 +1,25 @@ #!/bin/bash +set -e + if (( $# != 1 )); then echo "usage: $0 extra" echo " $0 testing" exit 1 fi -linux32 makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -linux32 makechrootpkg -r /var/lib/archbuild/$1-i686 +here=$PWD +cd /var/empty +linux32 makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-guest-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +cd "$here" +linux32 makechrootpkg -n -r /var/lib/archbuild/$1-i686 -makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -makechrootpkg -r /var/lib/archbuild/$1-x86_64 +cd /var/empty +makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-guest-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +cd "$here" +makechrootpkg -n -r /var/lib/archbuild/$1-x86_64 # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index 1116a6c5b..b72f74640 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 84040 2013-02-09 01:31:49Z foutrelis $ +# $Id: PKGBUILD 85488 2013-03-02 01:43:50Z seblu $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') -pkgver=4.2.6 -pkgrel=6 +pkgver=4.2.8 +_extramodules=extramodules-3.7-ARCH +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -16,7 +17,7 @@ makedepends=('linux-headers' 'bc') build() { - _kernver=$(expac -Q '%v' linux-headers)-ARCH + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" # dkms need modification to be run as user cp -r /var/lib/dkms . @@ -30,8 +31,7 @@ build() { } package_virtualbox-host-modules(){ - _kernver=$(expac -Q '%v' linux-headers)-ARCH - _extraver=extramodules-${_kernver%.*}-ARCH + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" pkgdesc='Host kernel modules for VirtualBox' depends=("linux>=${_kernver%.*}" "linux<$(echo "${_kernver%.*}+0.1"|bc)") @@ -39,16 +39,15 @@ package_virtualbox-host-modules(){ conflicts=('virtualbox-modules') install=virtualbox-host-modules.install - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" + install -dm755 "$pkgdir/usr/lib/modules/$_extramodules" cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" - install -m644 * "$pkgdir/usr/lib/modules/$_extraver" + install -m644 * "$pkgdir/usr/lib/modules/$_extramodules" find "$pkgdir" -name '*.ko' -exec gzip -9 {} + - sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-host-modules.install" + sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" "$startdir/virtualbox-host-modules.install" } package_virtualbox-guest-modules(){ - _kernver=$(expac -Q '%v' linux-headers)-ARCH - _extraver=extramodules-${_kernver%.*}-ARCH + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" pkgdesc='Guest kernel modules for VirtualBox' license=('GPL') @@ -57,11 +56,11 @@ package_virtualbox-guest-modules(){ conflicts=('virtualbox-archlinux-modules') install=virtualbox-guest-modules.install - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" + install -dm755 "$pkgdir/usr/lib/modules/$_extramodules" cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" - install -m644 * "$pkgdir/usr/lib/modules/$_extraver" + install -m644 * "$pkgdir/usr/lib/modules/$_extramodules" find "$pkgdir" -name '*.ko' -exec gzip -9 {} + - sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-guest-modules.install" + sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" "$startdir/virtualbox-guest-modules.install" } # vim:set ts=2 sw=2 et: diff --git a/community/virtualbox-modules/build.sh b/community/virtualbox-modules/build.sh index 476449541..744f18330 100755 --- a/community/virtualbox-modules/build.sh +++ b/community/virtualbox-modules/build.sh @@ -1,18 +1,25 @@ #!/bin/bash +set -e + if (( $# != 1 )); then echo "usage: $0 extra" echo " $0 testing" exit 1 fi -linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -linux32 makechrootpkg -r /var/lib/archbuild/$1-i686 +here=$PWD +cd /var/empty +linux32 makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-guest-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +cd "$here" +linux32 makechrootpkg -n -r /var/lib/archbuild/$1-i686 -makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -makechrootpkg -r /var/lib/archbuild/$1-x86_64 +cd /var/empty +makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-guest-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +cd "$here" +makechrootpkg -n -r /var/lib/archbuild/$1-x86_64 # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/volumeicon/PKGBUILD b/community/volumeicon/PKGBUILD index 574ebfbde..d9fa8f85a 100644 --- a/community/volumeicon/PKGBUILD +++ b/community/volumeicon/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 70695 2012-05-15 07:22:05Z arodseth $ +# $Id: PKGBUILD 85519 2013-03-02 15:17:37Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Maato <maato softwarebakery com> pkgname=volumeicon -pkgver=0.4.6 -pkgrel=4 -pkgdesc="Volume control for your system tray" +pkgver=0.5.0 +pkgrel=1 +pkgdesc='Volume control for your system tray' arch=('x86_64' 'i686') -url="http://softwarebakery.com/maato/volumeicon.html" +url='http://softwarebakery.com/maato/volumeicon.html' license=('GPL3') -depends=('gtk2>=2.16.0' 'alsa-lib' 'libnotify') -source=("http://softwarebakery.com/maato/files/volumeicon/$pkgname-$pkgver.tar.gz" - "glib.patch") -sha256sums=('32f94adc5f346404ae564405dd483ae4bd04212df08e46f18d369b4ba2cb6590' - 'f2ab8b01cd9f554b170a773fa2a88c2874d97eb3fe106d4692595728201abeb0') +depends=('gtk3' 'alsa-lib' 'libnotify') +makedepends=('intltool') +source=("http://softwarebakery.com/maato/files/volumeicon/$pkgname-$pkgver.tar.gz") +sha256sums=('e5f1179f9ec5ab25e3740e4f6bbe0baa75368f0ae87d370197b3fbefb61bd782') build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 < ../glib.patch + sed -i 's/0.23/0.50.2/' configure.ac + autoconf ./configure \ --prefix=/usr \ --enable-notify diff --git a/community/volumeicon/glib.patch b/community/volumeicon/glib.patch deleted file mode 100644 index 93e47d2c4..000000000 --- a/community/volumeicon/glib.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- volumeicon-0.4.6/src/alsa_backend.backup 2012-05-15 09:12:13.469335762 +0200 -+++ volumeicon-0.4.6/src/alsa_backend.c 2012-05-15 09:12:31.862905251 +0200 -@@ -22,10 +22,7 @@ - //############################################################################## - - #include <alsa/asoundlib.h> --#include <glib/gstring.h> --#include <glib/gstdio.h> --#include <glib/glist.h> --#include <glib/giochannel.h> -+#include <glib.h> - - #include "alsa_backend.h" - diff --git a/community/weston/PKGBUILD b/community/weston/PKGBUILD new file mode 100644 index 000000000..b285d4a11 --- /dev/null +++ b/community/weston/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Sébastien Luttringer +# Contributor: Joel Teichroeb <joel@teichroeb.net> + +pkgname=weston +pkgver=1.0.5 +pkgrel=2 +pkgdesc='Reference implementation of a Wayland compositor' +arch=('i686' 'x86_64') +url='http://wayland.freedesktop.org' +license=('MIT') +options=(!libtool) +depends=('libxkbcommon' 'wayland' 'mesa' 'cairo' 'poppler-glib' 'mtdev' 'libxcursor' 'glu') +source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz") +sha1sums=('a97030613e066c05e267ea0d7888fd5f7a08eea2') + +build() { + cd $pkgname-$pkgver + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/weston \ + --disable-android-compositor + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + # license + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + # embed more clients + for _c in clickdot cliptest dnd editor eventdemo flower gears image \ + keyboard resizor simple-egl simple-shm smoke view; do + install -Dm755 "clients/$_c" "$pkgdir/usr/bin/weston-$_c" + done +} diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD index 3e3c9622a..b29225ea3 100644 --- a/core/sudo/PKGBUILD +++ b/core/sudo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 176862 2013-02-01 23:10:02Z foutrelis $ +# $Id: PKGBUILD 179047 2013-03-02 08:17:27Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sudo -_sudover=1.8.6p6 +_sudover=1.8.6p7 pkgver=${_sudover/p/.p} pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root" @@ -16,8 +16,8 @@ backup=('etc/sudoers' 'etc/pam.d/sudo') options=('!libtool') source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig} sudo.pam) -sha256sums=('d600fee5cb2e843450263a2b8f133b9921ffa00cb6b841b0da82613447cefb7c' - 'a0f1bcd26dce567a129a4e53224f012c23960c37de04c87e5004b3571e9de9f1' +sha256sums=('301089edb22356f59d097f6abbe1303f03927a38691b02959d618546c2125036' + 'ab7660cbaba45f6aff03abbae69a62e9644a86bed76b53334364147569f104d6' 'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae') build() { diff --git a/extra/graphite/PKGBUILD b/extra/graphite/PKGBUILD index b46e5f298..914b2bc03 100644 --- a/extra/graphite/PKGBUILD +++ b/extra/graphite/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 173763 2012-12-22 16:44:26Z andyrtr $ +# $Id: PKGBUILD 179056 2013-03-02 11:28:27Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=graphite -pkgver=1.2.0 +pkgver=1.2.1 pkgrel=1 epoch=1 arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('cmake' 'freetype2' 'python2') # 'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 'perl-module-build' 'icu') - only for docs - target doesn't install properly options=('!libtool' '!emptydirs') source=("http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz") -md5sums=('f5ef3f7f10fa8c3542c6a085a233080b') +md5sums=('edf70ab2f7d789be219f47b1df00d67e') build() { cd "${srcdir}" @@ -26,7 +26,7 @@ build() { -DCMAKE_BUILD_TYPE:STRING=Release \ -DGRAPHITE2_COMPARE_RENDERER=OFF make - make docs +# make docs } check() { diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD deleted file mode 100644 index 1e1eaa593..000000000 --- a/extra/icedtea-web/PKGBUILD +++ /dev/null @@ -1,86 +0,0 @@ -# $Id: PKGBUILD 170458 2012-11-07 20:07:26Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgbase=icedtea-web -pkgname=('icedtea-web' 'icedtea-web-doc') -pkgver=1.3.1 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://icedtea.classpath.org/wiki/IcedTea-Web" -license=('GPL2') -makedepends=('openjdk6' 'zip' 'gtk2' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany') -noextract=$pkgname-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot -source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz) -sha256sums=('20c7fd1eef6c79cbc6478bb01236a3eb2f0af6184eaed24baca59a3c37eafb56') - -_javaver=6 -_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk - -build() { - # extract it - cd "$srcdir" - LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/$pkgname-$pkgver.tar.gz - - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=${_jvmdir} \ - --datarootdir=/usr/share \ - --with-browser-tests \ - --with-firefox=/usr/bin/firefox \ - --with-chromium=/usr/bin/chromium \ - --with-epiphany=/usr/bin/epiphany \ - --with-gtk=2 - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - # as more tests have been added some are expectged to fail - # see http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-March/017566.html - make -k check || /bin/true -} - - -package_icedtea-web() { - - pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project" - depends=('openjdk6' 'gtk2' 'desktop-file-utils') - provides=('java-web-start=6') - install=$pkgname.install - - cd "$srcdir/$pkgname-$pkgver" - # possible make target (see bottom of Makefile.am: install-exec-local install-data-local - make DESTDIR="$pkgdir" install-exec-local install-data-local - - # Install desktop files. - install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps} - install -m644 javaws.png ${pkgdir}/usr/share/pixmaps - install -m644 {javaws,itweb-settings}.desktop ${pkgdir}/usr/share/applications - # remove splitted doc files - rm -rf ${pkgdir}/usr/share/doc - - # link binaries into /usr/bin + jre/bin - install -m755 -d ${pkgdir}/usr/bin - install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin - pushd ${pkgdir}/${_jvmdir}/bin - for file in *; do - ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin - ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/${_jvmdir}/jre/bin - done - popd - - # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml - install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/ - ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/ -} - -package_icedtea-web-doc() { - - pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files" - - cd "$srcdir/$pkgbase-$pkgver" - make DESTDIR="$pkgdir" install-data-local - # remove javaws about and man page - rm -rf ${pkgdir}/usr/lib - rm -rf ${pkgdir}/usr/share/man - rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it seems -} diff --git a/extra/icedtea-web/icedtea-web.install b/extra/icedtea-web/icedtea-web.install deleted file mode 100644 index 80312d4a6..000000000 --- a/extra/icedtea-web/icedtea-web.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index e32fe24e5..a2b13d6f1 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178048 2013-02-14 17:38:00Z giovanni $ +# $Id: PKGBUILD 179062 2013-03-02 20:09:24Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2013.02.11 +pkgver=2013.02.27 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('1dc7bc4dee0c63efe1eefe13478d168d') +md5sums=('7d0b620c37e2ab1646a33074d7fc39f9') build() { cd ${srcdir}/live diff --git a/community/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD index ba946890c..9678abd12 100644 --- a/community/mariadb/PKGBUILD +++ b/extra/mariadb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85328 2013-03-01 06:31:46Z bpiotrowski $ +# $Id: PKGBUILD 179064 2013-03-02 21:39:03Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgbase=mariadb diff --git a/community/mariadb/mariadb-post.sh b/extra/mariadb/mariadb-post.sh index c4ac18171..c4ac18171 100755 --- a/community/mariadb/mariadb-post.sh +++ b/extra/mariadb/mariadb-post.sh diff --git a/community/mariadb/mariadb-tmpfile.conf b/extra/mariadb/mariadb-tmpfile.conf index 6883dc798..6883dc798 100644 --- a/community/mariadb/mariadb-tmpfile.conf +++ b/extra/mariadb/mariadb-tmpfile.conf diff --git a/community/mariadb/mariadb.install b/extra/mariadb/mariadb.install index de619b668..de619b668 100644 --- a/community/mariadb/mariadb.install +++ b/extra/mariadb/mariadb.install diff --git a/community/mariadb/mariadb.service b/extra/mariadb/mariadb.service index dd65511d7..dd65511d7 100644 --- a/community/mariadb/mariadb.service +++ b/extra/mariadb/mariadb.service diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD deleted file mode 100644 index e4d5eec23..000000000 --- a/extra/openjdk6/PKGBUILD +++ /dev/null @@ -1,184 +0,0 @@ -# $Id: PKGBUILD 178353 2013-02-20 17:01:28Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgname=('openjdk6' 'openjdk6-src') -pkgbase="openjdk6" -_javaver=6 -_icedteaver=1.12.3 -_openjdk_version=b27 -_openjdk_date=26_oct_2012 -pkgver=${_javaver}.${_openjdk_version}_${_icedteaver} -pkgrel=1 -url='http://icedtea.classpath.org' -arch=('i686' 'x86_64') -license=('custom') -makedepends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'alsa-lib' 'giflib' 'libxp' 'gtk2' - 'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'libxt' 'nss' 'libxslt' - 'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'openjdk6' 'inetutils' 'wget') -options=('!emptydirs') -source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz{,.sig} - http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz - http://icedtea.classpath.org/download/drops/jaxp144_04.zip - http://icedtea.classpath.org/download/drops/jdk6-jaxws2_1_6-2011_06_13.zip - http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip - fix_jdk_cmds_path.diff - fix_corba_cmds_path.diff - fontconfig-paths.diff - nonreparenting-wm.diff - disable_Werror.diff - openjdk6.profile - openjdk6.profile.csh) -noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz - jaxp144_04.zip - jdk6-jaxws2_1_6-2011_06_13.zip - jdk6-jaf-b20.zip) -sha256sums=('db9dc14fa537fb22616fcd9e5b80758aa7baa66e0b6f8adfe3d5e80414574b4c' - 'a6cbeccc4f25f72a940b9ac0c3e05ece50edc16c1c13f7a1a82ee895563930e3' - '044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0' - '490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c' - '229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3' - '78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012' - 'f5f59e121f7645ebc449bb13569fd924cbab3194e41db901f4fbe9dbd45720c5' - '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479' - '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' - '9c3c55c30729ec44fab14c3f3f841c273730c7467d8908a72f018bc9e9f65bd9' - 'eb4c7f4cf50f5f74b683857f707bd21ec3847267e2e5e3173f42a6910a024f97' - '26e2cd5a6034f08a685129c9412f487b9931fb0d556f1ccceab17bdb75a372cd' - '0c2d9116d6e550021994d6713a93621a9df685d2182996be3249ad812712b007') - -build() { - - unset JAVA_HOME - unset CLASSPATH - - [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh - - _javaver=6 - _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk - - cd ${srcdir}/icedtea6-${_icedteaver} - - ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz . - - cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/ - - autoreconf -i - - export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff patches/disable_Werror.diff" - - export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" - export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}" - unset MAKEFLAGS - - ./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \ - --with-ant-home=/usr/share/java/apache-ant \ - --with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH \ - --with-jaxp-drop-zip=${srcdir}/jaxp144_04.zip \ - --with-jaxws-drop-zip=${srcdir}/jdk6-jaxws2_1_6-2011_06_13.zip \ - --with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \ - --disable-bootstrap \ - --with-abs-install-dir=${_jvmdir} - LD_PRELOAD="" make -} - -package_openjdk6() { - pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.' - backup=(etc/profile.d/openjdk6.sh) - depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng>=1.5.7') - optdepends=('icedtea-web: web browser plugin + Java Web Start' - 'alsa-lib: for sound' - 'giflib: for gif format support') - conflicts=('java-environment' 'java-runtime') - provides=('java-environment=6' 'java-runtime=6' 'java-runtime-headless=6') - install=openjdk6.install - - if [ "${CARCH}" = "x86_64" ]; then - _arch=amd64 - else - _arch=i586 - fi - - _javaver=6 - _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk - - cd ${srcdir}/icedtea6-${_icedteaver} - install -m755 -d ${pkgdir}/${_jvmdir}/jre - - pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image - - # Install main files. - cp -a bin include lib ${pkgdir}/${_jvmdir}/ - cp -a jre/bin jre/lib ${pkgdir}/${_jvmdir}/jre/ - - mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.properties.src \ - ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.properties.src - mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.bfc \ - ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.bfc - rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.bfc - rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.properties.src - - # Install man pages. - install -m755 -d ${pkgdir}/usr/share/man/man1 - install -m644 man/man1/*.1 ${pkgdir}/usr/share/man/man1/ - - # Install demos and samples. - cp -a demo ${pkgdir}/${_jvmdir}/ - install -m755 -d sample/rmi - mv bin/java-rmi.cgi sample/rmi - cp -a sample ${pkgdir}/${_jvmdir}/ - popd - - # Install icons and menu entries. - for s in 16 24 32 48 ; do - install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps - install -m644 openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \ - ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png - done - - # Install desktop files. - install -m755 -d ${pkgdir}/usr/share/applications - install -m644 {jconsole,policytool}.desktop ${pkgdir}/usr/share/applications - - # link binaries into /usr/bin - install -m755 -d ${pkgdir}/usr/bin - pushd ${pkgdir}/${_jvmdir}/bin - for file in *; do - ln -sf ${_jvmdir}/bin/${file} \ - ${pkgdir}/usr/bin - done - popd - - # link JKS keystore from ca-certificates-java - rm -f ${pkgdir}/${_jvmdir}/jre/lib/security/cacerts - ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/jre/lib/security/cacerts" - - # set some variables - install -m755 -d ${pkgdir}/etc/profile.d - install -m755 ${srcdir}/openjdk6.profile ${pkgdir}/etc/profile.d/openjdk6.sh - install -m755 ${srcdir}/openjdk6.profile.csh ${pkgdir}/etc/profile.d/openjdk6.csh - - # install license - install -Dm644 ${srcdir}//icedtea6-${_icedteaver}/openjdk/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} - -package_openjdk6-src() { - pkgdesc='Free Java environment based on OpenJDK 6.0 Source Bundle' - depends=('openjdk6') - - if [ "${CARCH}" = "x86_64" ]; then - _arch=amd64 - else - _arch=i586 - fi - - _javaver=6 - _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk - - cd ${srcdir}/icedtea6-${_icedteaver} - install -m755 -d ${pkgdir}/${_jvmdir}/jre - - pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image - # Install src.zip file - cp -a src.zip ${pkgdir}/${_jvmdir}/ -} diff --git a/extra/openjdk6/disable_Werror.diff b/extra/openjdk6/disable_Werror.diff deleted file mode 100644 index fa8887a10..000000000 --- a/extra/openjdk6/disable_Werror.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- openjdk/hotspot/make/linux/makefiles/gcc.make 2012-06-07 16:30:51.000000000 +0200 -+++ openjdk/hotspot/make/linux/makefiles/gcc.make.new 2012-06-14 15:32:44.967695139 +0200 -@@ -150,7 +150,7 @@ - endif - - # Compiler warnings are treated as errors --WARNINGS_ARE_ERRORS = -Werror -+#WARNINGS_ARE_ERRORS = -Werror - - # Except for a few acceptable ones - # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit diff --git a/extra/openjdk6/fix_corba_cmds_path.diff b/extra/openjdk6/fix_corba_cmds_path.diff deleted file mode 100644 index 7a3db9567..000000000 --- a/extra/openjdk6/fix_corba_cmds_path.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- openjdk/corba/make/common/shared/Defs-utils.gmk.old 2008-04-13 13:26:12.000000000 +0300 -+++ openjdk/corba/make/common/shared/Defs-utils.gmk 2008-04-14 15:35:13.000000000 +0300 -@@ -76,7 +76,7 @@ - CHMOD = $(UTILS_COMMAND_PATH)chmod - CMP = $(UTILS_USR_BIN_PATH)cmp - COMM = $(UTILS_USR_BIN_PATH)comm --COMPRESS = $(UTILS_USR_BIN_PATH)compress -+COMPRESS = $(UTILS_COMMAND_PATH)compress - CP = $(UTILS_COMMAND_PATH)cp - CPIO = $(UTILS_COMMAND_PATH)cpio - CUT = $(UTILS_USR_BIN_PATH)cut -@@ -125,7 +125,7 @@ - TAIL = $(UTILS_USR_BIN_PATH)tail - TAR = $(UTILS_COMMAND_PATH)tar - TEST = $(UTILS_USR_BIN_PATH)test --TOUCH = $(UTILS_COMMAND_PATH)touch -+TOUCH = $(UTILS_USR_BIN_PATH)touch - TR = $(UTILS_USR_BIN_PATH)tr - TRUE = $(UTILS_COMMAND_PATH)true - UNAME = $(UTILS_COMMAND_PATH)uname -@@ -176,7 +176,7 @@ - # others have it in /usr/bin. - SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \ - $(wildcard $(UTILS_USR_BIN_PATH)sort)) -- NAWK = $(USRBIN_PATH)gawk -+ NAWK = $(UTILS_COMMAND_PATH)gawk - # Intrinsic unix command, with backslash-escaped character interpretation - ECHO = /bin/echo -e - # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not) diff --git a/extra/openjdk6/fix_jdk_cmds_path.diff b/extra/openjdk6/fix_jdk_cmds_path.diff deleted file mode 100644 index bd37dd4ba..000000000 --- a/extra/openjdk6/fix_jdk_cmds_path.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- openjdk/jdk/make/common/shared/Defs-utils.gmk.old 2008-04-13 13:33:23.000000000 +0300 -+++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2008-04-14 15:37:34.000000000 +0300 -@@ -89,7 +89,7 @@ - CHMOD = $(UTILS_COMMAND_PATH)chmod - CMP = $(UTILS_USR_BIN_PATH)cmp - COMM = $(UTILS_USR_BIN_PATH)comm --COMPRESS = $(UTILS_USR_BIN_PATH)compress -+COMPRESS = $(UTILS_COMMAND_PATH)compress - CP = $(UTILS_COMMAND_PATH)cp - CPIO = $(UTILS_COMMAND_PATH)cpio - CUT = $(UTILS_USR_BIN_PATH)cut -@@ -137,7 +137,7 @@ - TAIL = $(UTILS_USR_BIN_PATH)tail - TAR = $(UTILS_COMMAND_PATH)tar - TEST = $(UTILS_USR_BIN_PATH)test --TOUCH = $(UTILS_COMMAND_PATH)touch -+TOUCH = $(UTILS_USR_BIN_PATH)touch - TR = $(UTILS_USR_BIN_PATH)tr - TRUE = $(UTILS_COMMAND_PATH)true - UNAME = $(UTILS_COMMAND_PATH)uname -@@ -178,7 +178,7 @@ - BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \ - $(wildcard $(UTILS_USR_BIN_PATH)basename)) - -- NAWK = $(USRBIN_PATH)gawk -+ NAWK = $(UTILS_COMMAND_PATH)gawk - # Intrinsic unix command, with backslash-escaped character interpretation - ECHO = /bin/echo -e - # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not) diff --git a/extra/openjdk6/fontconfig-paths.diff b/extra/openjdk6/fontconfig-paths.diff deleted file mode 100644 index fa08db629..000000000 --- a/extra/openjdk6/fontconfig-paths.diff +++ /dev/null @@ -1,134 +0,0 @@ ---- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties 2009-05-29 22:45:23.024341869 +0000 -+++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.new 2009-05-29 22:55:13.681366890 +0000 -@@ -275,73 +275,61 @@ - - # Font File Names - --filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf --filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf --filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf --filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf -- --filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf --filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf --filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf --filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf -- --filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf --filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf --filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf --filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf -- --filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc --filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc --filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc --filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf -- --filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf --filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf --filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf --filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf --filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf --filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf --filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf --filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf --filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf --filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf --filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf --filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf --filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf -- --filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf --filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf --filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf --filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf --#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf --filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf --filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf --filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf --filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf --filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf -- --filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf --filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf --filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf --filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf --filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf --filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf --filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf --filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf --filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf --filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf --filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf --filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf -- --# AWT X11 font paths --awtfontpath.latin-1=/usr/share/fonts/X11/Type1 --awtfontpath.umingcn=/usr/share/fonts/truetype/arphic --awtfontpath.uminghk=/usr/share/fonts/truetype/arphic --awtfontpath.umingtw=/usr/share/fonts/truetype/arphic --awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic --awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy --awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi --awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami --awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic --awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk --awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts -+filename.DejaVu_Sans=/usr/share/fonts/TTF/DejaVuSans.ttf -+filename.DejaVu_Sans_Bold=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf -+filename.DejaVu_Sans_Oblique=/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf -+filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf -+ -+filename.DejaVu_Sans_Mono=/usr/share/fonts/TTF/DejaVuSansMono.ttf -+filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf -+filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf -+filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf -+ -+filename.DejaVu_Serif=/usr/share/fonts/TTF/DejaVuSerif.ttf -+filename.DejaVu_Serif_Bold=/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf -+filename.DejaVu_Serif_Oblique=/usr/share/fonts/TTF/DejaVuSerif-Oblique.ttf -+filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSerif-BoldOblique.ttf -+ -+filename.AR_PL_UMing_CN=/usr/share/fonts/TTF/uming.ttc -+filename.AR_PL_UMing_HK=/usr/share/fonts/TTF/uming.ttc -+filename.AR_PL_UMing_TW=/usr/share/fonts/TTF/uming.ttc -+filename.AR_PL_ShanHeiSun_Uni=/usr/share/TTF/uming.ttf -+ -+filename.WenQuanYi_Zen_Hei=/usr/share/fonts/TTF/wqy-zenhei.ttf -+filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf -+filename.UnBatang=/usr/share/fonts/TTF/UnBatang.ttf -+filename.UnBatang_Bold=/usr/share/fonts/TTF/UnBatangBold.ttf -+filename.Baekmuk_Gulim=/usr/share/fonts/TTF/gulim.ttf -+filename.UnDotum=/usr/share/fonts/TTF/UnDotum.ttf -+filename.UnDotum_Bold=/usr/share/fonts/TTF/UnDotumBold.ttf -+filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic.ttf -+filename.Sazanami_Gothic=/usr/share/fonts/TTF/sazanami-gothic.ttf -+filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho.ttf -+filename.Sazanami_Mincho=/usr/share/fonts/TTF/sazanami-mincho.ttf -+filename.VL_Gothic=/usr/share/fonts/TTF/VL-Gothic-Regular.ttf -+filename.VL_PGothic=/usr/share/fonts/TTF/VL-PGothic-Regular.ttf -+ -+filename.Lohit_Bengali=/usr/share/fonts/TTF/lohit_bn.ttf -+filename.Lohit_Gujarati=/usr/share/fonts/TTF/lohit_gu.ttf -+filename.Lohit_Hindi=/usr/share/fonts/TTF/lohit_hi.ttf -+filename.Lohit_Kannda=/usr/share/fonts/TTF/lohit_kn.ttf -+#filename.Lohit_Malayalam=/usr/share/fonts/TTF/lohit_ml.ttf -+filename.Lohit_Oriya=/usr/share/fonts/TTF/lohit_or.ttf -+filename.Lohit_Punjabi=/usr/share/fonts/TTF/lohit_pa.ttf -+filename.Lohit_Tamil=/usr/share/fonts/TTF/lohit_ta.ttf -+filename.Lohit_Telugu=/usr/share/fonts/TTF/lohit_te.ttf -+filename.LKLUG=/usr/share/fonts/TTF/lklug.ttf -+ -+filename.LuxiSans-Regular=/usr/share/fonts/TTF/luxisr.ttf -+filename.LuxiSans-Bold=/usr/share/fonts/TTF/luxisb.ttf -+filename.LuxiSans-Oblique=/usr/share/fonts/TTF/luxisri.ttf -+filename.LuxiSans-BoldOblique=/usr/share/fonts/TTF/luxisbi.ttf -+filename.LuxiMono-Regular=/usr/share/fonts/TTF/luximr.ttf -+filename.LuxiMono-Bold=/usr/share/fonts/TTF/luximb.ttf -+filename.LuxiMono-Oblique=/usr/share/fonts/TTF/luximri.ttf -+filename.LuxiMono-BoldOblique=/usr/share/fonts/TTF/luximbi.ttf -+filename.LuxiSerif-Regular=/usr/share/fonts/TTF/luxirr.ttf -+filename.LuxiSerif-Bold=/usr/share/fonts/TTF/luxirb.ttf -+filename.LuxiSerif-Oblique=/usr/share/fonts/TTF/luxirri.ttf -+filename.LuxiSerif-BoldOblique=/usr/share/fonts/TTF/luxirbi.ttf -+ diff --git a/extra/openjdk6/nonreparenting-wm.diff b/extra/openjdk6/nonreparenting-wm.diff deleted file mode 100644 index 65fa66e89..000000000 --- a/extra/openjdk6/nonreparenting-wm.diff +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWM.java b/jdk/src/solaris/classes/sun/awt/X11/XWM.java -index 68d1ff7..878327e 100644 ---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java -+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java -@@ -99,7 +99,8 @@ - METACITY_WM = 11, - COMPIZ_WM = 12, - LG3D_WM = 13, -- MUTTER_WM = 14; -+ MUTTER_WM = 14, -+ OTHER_NONREPARENTING_WM = 15; - public String toString() { - switch (WMID) { - case NO_WM: -@@ -564,7 +567,7 @@ class XWM implements MWMConstants, XUtilConstants { - } - - static boolean isNonReparentingWM() { -- return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM); -+ return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM); - } - - /* -@@ -764,9 +767,17 @@ class XWM implements MWMConstants, XUtilConstants { - * supports WIN or _NET wm spec. - */ - else if (l_net_protocol.active()) { -- awt_wmgr = XWM.OTHER_WM; -+ if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { -+ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; -+ } else { -+ awt_wmgr = XWM.OTHER_WM; -+ } - } else if (win.active()) { -- awt_wmgr = XWM.OTHER_WM; -+ if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { -+ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; -+ } else { -+ awt_wmgr = XWM.OTHER_WM; -+ } - } - /* - * Check for legacy WMs. -@@ -777,6 +788,8 @@ class XWM implements MWMConstants, XUtilConstants { - awt_wmgr = XWM.MOTIF_WM; - } else if (isOpenLook()) { - awt_wmgr = XWM.OPENLOOK_WM; -+ } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { -+ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; - } else { - awt_wmgr = XWM.OTHER_WM; - } -@@ -1298,6 +1311,7 @@ class XWM implements MWMConstants, XUtilConstants { - res = new Insets(28, 6, 6, 6); - break; - case NO_WM: -+ case OTHER_NONREPARENTING_WM: - case LG3D_WM: - res = zeroInsets; - break; diff --git a/extra/openjdk6/openjdk6.install b/extra/openjdk6/openjdk6.install deleted file mode 100644 index 653c8fe2f..000000000 --- a/extra/openjdk6/openjdk6.install +++ /dev/null @@ -1,24 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null - if [ ! -f /etc/ssl/certs/java/cacerts ]; then - /usr/sbin/init-jks-keystore - fi - echo "when you use a non-reparenting window manager" - echo "set _JAVA_AWT_WM_NONREPARENTING=1 in" - echo "/etc/profile.d/openjdk6.sh" -# update-desktop-database -q -} - -post_upgrade() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null - if [ ! -f /etc/ssl/certs/java/cacerts ]; then - /usr/sbin/init-jks-keystore - fi -# update-desktop-database -q -} - - -post_remove() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null -# update-desktop-database -q -} diff --git a/extra/openjdk6/openjdk6.profile b/extra/openjdk6/openjdk6.profile deleted file mode 100644 index 9da4421ef..000000000 --- a/extra/openjdk6/openjdk6.profile +++ /dev/null @@ -1,6 +0,0 @@ -export J2SDKDIR=/usr/lib/jvm/java-6-openjdk -export J2REDIR=$J2SDKDIR/jre -export JAVA_HOME=/usr/lib/jvm/java-6-openjdk - -# enable this for non-reparenting window managers -#export _JAVA_AWT_WM_NONREPARENTING=1 diff --git a/extra/openjdk6/openjdk6.profile.csh b/extra/openjdk6/openjdk6.profile.csh deleted file mode 100644 index 3cb15fd49..000000000 --- a/extra/openjdk6/openjdk6.profile.csh +++ /dev/null @@ -1,6 +0,0 @@ -setenv J2SDKDIR "/usr/lib/jvm/java-6-openjdk" -setenv J2REDIR "$J2SDKDIR/jre" -setenv JAVA_HOME "/usr/lib/jvm/java-6-openjdk" - -# enable this for non-reparenting window managers -#setenv _JAVA_AWT_WM_NONREPARENTING 1 diff --git a/extra/qoauth/PKGBUILD b/extra/qoauth/PKGBUILD index 86b4adc21..de947b29e 100644 --- a/extra/qoauth/PKGBUILD +++ b/extra/qoauth/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153702 2012-03-18 08:58:10Z andrea $ +# $Id: PKGBUILD 179067 2013-03-02 22:33:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Peter Richard Lewis <plewis@aur.archlinux.org> pkgname=qoauth pkgver=1.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="Support with OAuth-powered network services" url='http://github.com/ayoy/qoauth' license=('GPL') @@ -15,16 +15,16 @@ source=("http://files.ayoy.net/qoauth/release/current/src/${pkgname}-${pkgver}-s md5sums=('bcb6d01e6c9a6fb22099c9e0f5889578') build() { - cd "${srcdir}/${pkgname}-${pkgver}-src" + cd ${pkgname}-${pkgver}-src # Install libraries in /usr/lib/ sed -i 's|lib64|lib|' src/src.pro - qmake + qmake-qt4 make } package() { - cd "${srcdir}/${pkgname}-${pkgver}-src" + cd ${pkgname}-${pkgver}-src make INSTALL_ROOT="${pkgdir}" install } diff --git a/extra/qt-assistant-compat/PKGBUILD b/extra/qt-assistant-compat/PKGBUILD index 8c8d6859a..a189b314b 100644 --- a/extra/qt-assistant-compat/PKGBUILD +++ b/extra/qt-assistant-compat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178985 2013-03-01 10:24:14Z andrea $ +# $Id: PKGBUILD 179069 2013-03-02 22:41:59Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=qt-assistant-compat pkgver=4.6.3 -pkgrel=3 +pkgrel=4 pkgdesc="compat version of Qt Assistant" url="http://qt-project.org/" arch=('i686' 'x86_64') @@ -16,8 +16,6 @@ md5sums=('a20148e0488d5c12ab35ccc107dcc64d' # separate package function does not really work here due to broken build files build() { - . /etc/profile.d/qt4.sh - cd ${srcdir}/qt-assistant-qassistantclient-library-compat-version-${pkgver} patch -Np1 -i ${srcdir}/debian_patches_01_build_system.diff @@ -25,11 +23,11 @@ build() { cd lib; if [ -e Makefile ]; then $(MAKE) distclean; fi rm -f translations/assistant_adp_*.qm - qmake CONFIG+=create_prl + qmake-qt4 CONFIG+=create_prl make cd ../translations; lrelease assistant_adp_*.ts cd .. - qmake CONFIG+=create_prl + qmake-qt4 CONFIG+=create_prl make } @@ -46,11 +44,11 @@ package() { ${pkgdir}/usr/lib/libQtAssistantClient.prl # Install translations - install -d ${pkgdir}/usr/share/qt/translations/ + install -d ${pkgdir}/usr/share/qt4/translations/ install -p -m0644 translations/assistant_adp_*.qm \ - ${pkgdir}/usr/share/qt/translations/ + ${pkgdir}/usr/share/qt4/translations/ # Install prf file install -D -p -m0644 features/assistant.prf \ - ${pkgdir}/usr/share/qt/mkspecs/features/assistant.prf + ${pkgdir}/usr/share/qt4/mkspecs/features/assistant.prf } diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD index c101f1f2b..2efcd355f 100644 --- a/extra/qt4/PKGBUILD +++ b/extra/qt4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 179026 2013-03-01 17:55:20Z andrea $ +# $Id: PKGBUILD 179054 2013-03-02 09:03:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qt4 pkgver=4.8.4 -pkgrel=12 +pkgrel=13 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -114,8 +114,6 @@ package() { find "${pkgdir}/usr/lib" -type f -name '*.prl' \ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; - # Do not install the qttools - rm "${pkgdir}"/usr/lib/qt4/bin/{assistant,designer,linguist} - rm -r "${pkgdir}"/usr/lib/qt4/plugins/designer - rm "${pkgdir}"/usr/share/qt4/translations/{assistant,designer,linguist}_*.qm + # The TGA plugin is broken (FS#33568) + rm "${pkgdir}"/usr/lib/qt4/plugins/imageformats/libqtga.so } diff --git a/extra/qwt/PKGBUILD b/extra/qwt/PKGBUILD index 2d653e600..1fe4ae2c7 100644 --- a/extra/qwt/PKGBUILD +++ b/extra/qwt/PKGBUILD @@ -1,31 +1,27 @@ -# $Id: PKGBUILD 178991 2013-03-01 10:24:47Z andrea $ +# $Id: PKGBUILD 179060 2013-03-02 20:03:20Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=qwt pkgver=6.0.1 -pkgrel=4 +pkgrel=5 pkgdesc="Qt Widgets for Technical Applications" arch=('i686' 'x86_64') url="http://qwt.sourceforge.net/" depends=('qt4') -options=('!makeflags') license=("custom:$pkgname") -source=("http://downloads.sourceforge.net/sourceforge/qwt/$pkgname-$pkgver.tar.bz2" \ +source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.bz2" \ "qwtconfig-archlinux.pri") sha1sums=('301cca0c49c7efc14363b42e082b09056178973e' 'aba0fc75f6d450237028b7b143bdcf05a79cabb3') build() { - . /etc/profile.d/qt4.sh - cd ${srcdir}/${pkgname}-${pkgver} # copy our config file to the right place - install -Dm644 ${srcdir}/qwtconfig-archlinux.pri \ - ${srcdir}/${pkgname}-${pkgver}/qwtconfig.pri + cp ${srcdir}/qwtconfig-archlinux.pri qwtconfig.pri # build qwt: - qmake qwt.pro + qmake-qt4 qwt.pro make } @@ -39,11 +35,12 @@ package() { install -Dm755 designer/plugins/designer/libqwt_designer_plugin.so \ ${pkgdir}/usr/lib/qt4/plugins/designer/ - # Move man files to proper directory. -# install -d ${pkgdir}/usr/share/man/man3 -# mv -f ${pkgdir}/usr/share/doc/qwt/man/man3/* ${pkgdir}/usr/share/man/man3 + # needed by qmake (FS#30407) + install -d "${pkgdir}"/usr/share/qt4/mkspecs/features/ + install -m644 qwtconfig.pri qwt.prf \ + "${pkgdir}"/usr/share/qt4/mkspecs/features/ # install licence install -Dm644 ${srcdir}/${pkgname}-${pkgver}/COPYING \ - ${pkgdir}/usr/share/licenses/${pkgname}/license.txt + ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } |