fetch upstream changes

This commit is contained in:
cippaciong 2013-02-21 03:19:03 +01:00
commit f2b081a55c
151 changed files with 15619 additions and 5453 deletions

View file

@ -1,7 +1,7 @@
buildarch=18
pkgname=raspberrypi-firmware
pkgver=20130115
pkgver=20130218
pkgrel=1
pkgdesc="Firmware files for Raspberry Pi"
arch=('any')

View file

@ -5,7 +5,7 @@
pkgname=sunxi-tools
pkgver=20120806
pkgver=20130201
pkgrel=1
pkgdesc="Tools for Allwinner A10 (sun4i): fex, fel, pheonix_info"
arch=('arm' 'armv7h')
@ -15,7 +15,7 @@ depends=('libusb')
makedepends=('git' 'pkg-config' 'libusb')
provides=('sunxi-tools')
_gitroot="git://github.com/amery/sunxi-tools.git"
_gitroot="git://github.com/linux-sunxi/sunxi-tools.git"
_gitname="sunxi-tools"
build() {
@ -28,7 +28,7 @@ build() {
msg "Git checkout: Tree has been updated"
else
msg "Git checkout: Retrieving sources"
git clone ${_gitroot}
git clone --depth 1 ${_gitroot}
fi
msg "Checkout completed"
@ -47,6 +47,8 @@ package() {
cp fexc $pkgdir/usr/bin
cp bootinfo $pkgdir/usr/bin
cp fel $pkgdir/usr/bin
cp pio $pkgdir/usr/bin
cp nand-part $pkgdir/usr/bin
# make symlinks for bin2fex/fex2bin
cd $pkgdir/usr/bin

View file

@ -1,21 +1,24 @@
# Maintainer: Mike Staszel <mikestaszel@gmail.com>
# Plugbox changes: This package is from Debian
# Maintainer: stratum nine <strata@dropswitch.net>
pkgname=uboot-mkimage
pkgver=0.4
pkgver=2013.01.01
pkgrel=1
plugrel=1
pkgdesc="This package contains the mkimage utility, which encapsulates a compressed "uImage" Linux kernel image for use with the U-Boot bootloader"
arch=('arm')
license=('GPL2')
license=('GPL')
url="http://www.denx.de/wiki/U-Boot/WebHome"
depends=('coreutils')
makedepends=()
source=(uboot-mkimage-0.4.tar.gz)
md5sums=('7e1ead94aad813ec1d4ed5a8a8a2466c')
depends=('glibc')
source=(http://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2)
md5sums=('73939f78606f89a1775c7e9acb2ca617')
build() {
cd ${srcdir}/
cp -R ./usr ${pkgdir}/
cd ${srcdir}/u-boot-${pkgver}
# Build tools only
make tools
}
package() {
install -Dm 755 $srcdir/u-boot-${pkgver}/tools/mkimage $pkgdir/usr/bin/mkimage
install -Dm 644 $srcdir/u-boot-${pkgver}/doc/mkimage.1 $pkgdir/usr/share/man/man1/mkimage.1
}

92
alarm/xbmc-rbp/PKGBUILD Normal file
View file

@ -0,0 +1,92 @@
# Contributor tomasgroth at yahoo.dk
# Contributor WarheadsSE <max@warheads.net>
pkgname=xbmc-rbp
pkgver=12.0
pkgrel=3
buildarch=16
pkgdesc="A software media player and entertainment hub for digital media for the Raspberry Pi"
arch=('armv6h')
url="http://xbmc.org"
license=('GPL' 'custom')
depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate' 'libssh' 'libmicrohttpd' 'sdl_image' 'python2' 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez' 'tinyxml' 'raspberrypi-firmware' 'libcec-rpi' 'libplist' 'swig' 'taglib')
makedepends=('boost' 'cmake' 'gperf' 'nasm' 'zip' 'udisks' 'upower' 'bluez' 'git' 'autoconf' 'openjdk6')
optdepends=(
'lirc: remote controller support'
'udisks: automount external drives'
'upower: used to trigger suspend functionality'
'unrar: access compressed files without unpacking them'
'xorg-server: use systemd to start xbmc'
'xf86-video-fbdev: use systemd to start xbmc'
)
provides=("xbmc")
conflicts=("xbmc")
install="xbmc.install"
source=(http://mirrors.xbmc.org/releases/source/xbmc-${pkgver}.tar.gz
xbmc-ae04d99-321-texturepacker-hostflags-and-rework.patch
xbmc.service)
md5sums=('a79128b9d094a046947bfd9bb4550809'
'fc6a925a09ba1b13d84daf1121b42ab9'
'76fae229ebc3bcfaab7e7f27e4fb51f5')
_prefix=/usr
build() {
cd "${srcdir}/xbmc-${pkgver}"
# fix lsb_release dependency
sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp
# Patch to fix TexturePacker build.
patch -i ${srcdir}/xbmc-ae04d99-321-texturepacker-hostflags-and-rework.patch -p1
# Bootstrapping XBMC
./bootstrap
# Configuring XBMC
export PYTHON_VERSION=2 # external python v2
# we need to compile for armv6 instead of armv5 to avoid problems compiling assembler code
export CFLAGS="-O3 -mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp -mabi=aapcs-linux -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -I/opt/vc/include/ -I/opt/vc/include/IL -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux"
export CXXFLAGS="-O3 -mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp -mabi=aapcs-linux -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -I/opt/vc/include/ -I/opt/vc/include/IL -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux"
export LDFLAGS="$LDFLAGS -L/opt/vc/lib"
# export MAKEFLAGS="-j1"
./configure --prefix=$_prefix --exec-prefix=$_prefix \
--enable-gles --disable-sdl --disable-x11 --disable-xrandr --disable-openmax \
--disable-optical-drive --disable-dvdcss --disable-joystick --disable-debug \
--disable-crystalhd --disable-vtbdecoder --disable-vaapi --disable-vdpau \
--disable-pulse --disable-projectm --with-platform=raspberry-pi --enable-optimizations \
--enable-libcec --enable-player=omxplayer
make
}
package() {
cd "${srcdir}/xbmc-${pkgver}"
# Running make install
make DESTDIR="${pkgdir}" install
# run feh with python2
sed -i -e 's/python/python2/g' ${pkgdir}${_prefix}/bin/xbmc
# Remove checks that doesn't apply to the raspberry pi
head -n 171 "${pkgdir}${_prefix}/share/xbmc/FEH.py" > "${pkgdir}${_prefix}/share/xbmc/FEH.py.new"
mv "${pkgdir}${_prefix}/share/xbmc/FEH.py.new" "${pkgdir}${_prefix}/share/xbmc/FEH.py"
# lsb_release fix
sed -i -e 's/which lsb_release > \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}${_prefix}/bin/xbmc"
sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/ \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc"
# Tools
install -D -m 0755 "${srcdir}/xbmc-${pkgver}/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
# Licenses
install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${pkgname}"
for licensef in LICENSE.GPL copying.txt; do
mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}"
done
# systemd stuff
install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
}

View file

@ -0,0 +1,169 @@
diff -Naur xbmc-frodo-0ff0d2e/configure.in xbmc-frodo-0ff0d2e.patch/configure.in
--- xbmc-frodo-0ff0d2e/configure.in 2012-10-11 15:45:44.000000000 +0200
+++ xbmc-frodo-0ff0d2e.patch/configure.in 2012-10-11 16:49:08.872850880 +0200
@@ -452,6 +452,12 @@
[use_texturepacker=$enableval],
[use_texturepacker=auto])
+AC_ARG_WITH([texturepacker-root],
+ [AS_HELP_STRING([--with-texturepacker-root],
+ [root dir to search for librarys and includes if building native TexturePacker (default is \$prefix)])],
+ [use_texturepacker_root=$withval],
+ [use_texturepacker_root=$prefix])
+
AC_ARG_WITH([lirc-device],
[AS_HELP_STRING([--with-lirc-device=file],
[specify the default LIRC device (default is /dev/lircd)])],
@@ -2000,13 +2006,13 @@
USE_TEXTUREPACKER_NATIVE=0
if test "x$use_texturepacker" != "xno"; then
- final_message="$final_message\n TexturePacker:Yes"
USE_TEXTUREPACKER=1
- if test "x$use_texturepacker_native" = "xyes"; then
+ if test "x$cross_compiling" = "xyes"; then
USE_TEXTUREPACKER_NATIVE=1
- if [[ ! -d "$USE_TEXTUREPACKER_NATIVE_ROOT" ]]; then
- USE_TEXTUREPACKER_NATIVE_ROOT=
- fi
+ USE_TEXTUREPACKER_NATIVE_ROOT="$use_texturepacker_root"
+ final_message="$final_message\n TexturePacker:Native ($USE_TEXTUREPACKER_NATIVE_ROOT)"
+ else
+ final_message="$final_message\n TexturePacker:Yes"
fi
else
final_message="$final_message\n TexturePacker:No"
diff -Naur xbmc-frodo-0ff0d2e/lib/libsquish/Makefile.in xbmc-frodo-0ff0d2e.patch/lib/libsquish/Makefile.in
--- xbmc-frodo-0ff0d2e/lib/libsquish/Makefile.in 2012-10-11 15:47:26.000000000 +0200
+++ xbmc-frodo-0ff0d2e.patch/lib/libsquish/Makefile.in 2012-10-11 16:49:08.873850900 +0200
@@ -11,26 +11,25 @@
singlecolourfit.cpp \
squish.cpp
-CXXFLAGS+=-I.
-
-LIB=libsquish.a
-
-ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
-NATIVE_LIB=libsquish-native.so
-CLEAN_FILES+=$(NATIVE_LIB)
+LIB = libsquish.a
+NATIVE_LIB = libsquish-native.so
+CLEAN_FILES += $(NATIVE_LIB)
+
+HOST_CXX ?= g++
+CXXFLAGS += -I.
+HOST_CXXFLAGS += -I.
ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
-NATIVE_ARCH=@DARWIN_NATIVE_ARCH@
+ HOST_CXXFLAGS += @DARWIN_NATIVE_ARCH@
endif
-all: $(LIB) $(NATIVE_LIB)
+$(LIB): $(SRCS)
# TexturePacker links to libsquish and needs to run on build system, so make a native flavor.
$(NATIVE_LIB): $(SRCS)
ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
- g++ $(NATIVE_ARCH) -I. $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@
+ $(HOST_CXX) $(HOST_CXXFLAGS) $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@
else
- g++ -I. $(SRCS) -shared -fPIC -Wl,-soname,`pwd`/libsquish-native.so -o $@
-endif
+ $(HOST_CXX) $(HOST_CXXFLAGS) $(SRCS) -shared -fPIC -Wl,-soname,`pwd`/libsquish-native.so -o $@
endif
include ../../Makefile.include
diff -Naur xbmc-frodo-0ff0d2e/tools/TexturePacker/Makefile.in xbmc-frodo-0ff0d2e.patch/tools/TexturePacker/Makefile.in
--- xbmc-frodo-0ff0d2e/tools/TexturePacker/Makefile.in 2012-10-11 15:47:05.000000000 +0200
+++ xbmc-frodo-0ff0d2e.patch/tools/TexturePacker/Makefile.in 2012-10-11 16:49:08.874850920 +0200
@@ -1,56 +1,54 @@
-DEFINES += -D_LINUX -DUSE_LZO_PACKING
+DEFINES += -D_LINUX -DUSE_LZO_PACKING
ifneq ($(or $(findstring powerpc,@ARCH@),$(findstring ppc, @ARCH@)),)
-DEFINES += -DHOST_BIGENDIAN
+DEFINES += -DHOST_BIGENDIAN
endif
-CXXFLAGS+= \
+SRCS = \
+ md5.cpp \
+ SDL_anigif.cpp \
+ XBTFWriter.cpp \
+ XBMCTex.cpp \
+ @abs_top_srcdir@/xbmc/guilib/XBTF.cpp
+
+TARGET = TexturePacker
+CLEAN_FILES = $(TARGET)
+
+all: $(TARGET)
+
+HOST_CXX ?= g++
+HOST_ROOT_PATH = @USE_TEXTUREPACKER_NATIVE_ROOT@
+
+LIBS += -lSDL_image -lSDL -llzo2
+LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish
+HOST_LIBS += -L$(HOST_ROOT_PATH)/lib -lSDL_image -lSDL -llzo2
+HOST_LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish-native
+
+CXXFLAGS += \
-I. \
-I@abs_top_srcdir@/lib \
-I@abs_top_srcdir@/xbmc \
-I@abs_top_srcdir@/xbmc/linux
-RPATH=-Wl,-rpath=$(NATIVE_ROOT_PATH)/lib
+HOST_CXXFLAGS += \
+ -I. \
+ -I@abs_top_srcdir@/lib \
+ -I@abs_top_srcdir@/xbmc \
+ -I@abs_top_srcdir@/xbmc/linux \
+ -I$(HOST_ROOT_PATH)/include
+
+RPATH=-Wl,-rpath=$(HOST_ROOT_PATH)/lib
-ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
-NATIVE_ROOT_PATH=@USE_TEXTUREPACKER_NATIVE_ROOT@
-ifdef NATIVE_ROOT_PATH
ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
DEFINES += -DTARGET_DARWIN
NATIVE_ARCH=@DARWIN_NATIVE_ARCH@
RPATH=
endif
-NATIVE_CXXFLAGS+= -I. \
- -I$(NATIVE_ROOT_PATH)/include \
- -I@abs_top_srcdir@/lib \
- -I@abs_top_srcdir@/xbmc \
- -I@abs_top_srcdir@/xbmc/linux
-NATIVE_LIBS += -L$(NATIVE_ROOT_PATH)/lib
-endif
-NATIVE_LIBS += -lSDL_image -lSDL -llzo2
-NATIVE_LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish-native
-else
-LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish
-endif
-
-LIBS += -lSDL_image -lSDL -llzo2
-
-SRCS = \
- md5.cpp \
- SDL_anigif.cpp \
- XBTFWriter.cpp \
- XBMCTex.cpp \
- @abs_top_srcdir@/xbmc/guilib/XBTF.cpp
-
-
-TARGET = TexturePacker
-CLEAN_FILES=$(TARGET)
-
-all: $(TARGET)
ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
# TexturePacker run native on build system, build it with native tools
$(TARGET): $(SRCS) @abs_top_srcdir@/xbmc/guilib/XBTF.h
- g++ $(DEFINES) $(NATIVE_ARCH) $(NATIVE_CXXFLAGS) $(SRCS) $(NATIVE_LIBS) $(RPATH) -o $(TARGET)
+ make -C @abs_top_srcdir@/lib/libsquish libsquish-native.so
+ $(HOST_CXX) $(DEFINES) $(NATIVE_ARCH) $(HOST_CXXFLAGS) $(SRCS) $(HOST_LIBS) $(RPATH) -o $(TARGET)
clean:
rm -f $(TARGET)
else

View file

@ -0,0 +1,16 @@
post_install() {
[[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
[[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
getent group xbmc > /dev/null || groupadd xbmc
getent passwd xbmc > /dev/null || useradd -m -d /var/lib/xbmc -g xbmc xbmc
usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc
}
post_upgrade() {
post_install $1
}
post_remove() {
post_install $1
echo "You may want to remove xbmc user and group"
}

View file

@ -0,0 +1,13 @@
[Unit]
Description = Starts instance of XBMC using xinit
After = remote-fs.target
[Service]
User = xbmc
Group = xbmc
Type = simple
ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 -nolisten tcp
Restart = always
[Install]
WantedBy = multi-user.target

View file

@ -0,0 +1,50 @@
# Maintainer: Erik Andersson <erik.h.andersson@gmail.com>
# ArmSoc (OMAP + Mali) FrameBuffer driver for Xorg from the Chromium OS git.
# Official upstream is at
# http://git.linaro.org/gitweb?p=arm/xorg/driver/xf86-video-armsoc.git;a=summary
buildarch=4
pkgname="xf86-video-armsoc"
pkgver=20130220
pkgrel=1
arch=('armv7h')
url="http://git.chromium.org/gitweb/?p=chromiumos/third_party/xf86-video-armsoc.git;a=summary"
license=('GPL2')
makedepends=('git' 'pkgconfig' 'xorg-server-devel' 'resourceproto' 'scrnsaverproto')
options=('!libtool')
source=('compat_post_X_1.13.patch')
md5sums=('dba71c3a428a792f9b8bb015417b1b5f')
_gitroot="http://git.chromium.org/git/chromiumos/third_party/xf86-video-armsoc.git"
_gitname="xf86-video-armsoc"
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"
cd "$_gitname"
fi
msg "GIT checkout done or server timeout"
msg "Patching source..."
# X 1.13 compatibility from the Linaro upstream
patch -p1 -i ${srcdir}/compat_post_X_1.13.patch
msg "Starting build..."
./autogen.sh --prefix=/usr
make
}
package() {
pkgdesc="armsoc framebuffer driver for X from chromium os git"
cd "${srcdir}/${pkgname}"
make DESTDIR="${pkgdir}" install
}

View file

@ -0,0 +1,407 @@
From 66ab235b8070a894ec1252a6979d60f9a4f69749 Mon Sep 17 00:00:00 2001
From: Erik Andersson <erik.h.andersson@gmail.com>
Date: Wed, 20 Feb 2013 14:39:44 -0600
Subject: [PATCH 1/2] Patch for compat
---
src/compat-api.h | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 101 insertions(+)
create mode 100644 src/compat-api.h
diff --git a/src/compat-api.h b/src/compat-api.h
new file mode 100644
index 0000000..b74a582
--- /dev/null
+++ b/src/compat-api.h
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2012 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Author: Dave Airlie <airlied@redhat.com>
+ */
+
+/* this file provides API compat between server post 1.13 and pre it,
+ it should be reused inside as many drivers as possible */
+#ifndef COMPAT_API_H
+#define COMPAT_API_H
+
+#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
+#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
+#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
+#endif
+
+#ifndef XF86_HAS_SCRN_CONV
+#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum]
+#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
+#endif
+
+#ifndef XF86_SCRN_INTERFACE
+
+#define SCRN_ARG_TYPE int
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
+
+#define SCREEN_ARG_TYPE int
+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
+
+#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
+
+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
+
+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
+#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0
+
+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
+#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0
+
+#define FREE_SCREEN_ARGS_DECL int arg, int flags
+#define FREE_SCREEN_ARGS(x) (x)->scrnIndex, 0
+
+#define VT_FUNC_ARGS_DECL int arg, int flags
+#define VT_FUNC_ARGS(flags) pScrn->scrnIndex, (flags)
+
+#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex)
+#else
+#define SCRN_ARG_TYPE ScrnInfoPtr
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
+
+#define SCREEN_ARG_TYPE ScreenPtr
+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
+
+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+
+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+#define CLOSE_SCREEN_ARGS pScreen
+
+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
+#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y
+
+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
+#define SWITCH_MODE_ARGS(arg, m) arg, m
+
+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
+#define FREE_SCREEN_ARGS(x) (x)
+
+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
+#define VT_FUNC_ARGS(flags) pScrn
+
+#define XF86_ENABLEDISABLEFB_ARG(x) (x)
+
+#endif
+
+#endif
--
1.8.1.3
From 689d8c9bb456c4716350af64b138b2e18365d3ab Mon Sep 17 00:00:00 2001
From: Erik Andersson <erik.h.andersson@gmail.com>
Date: Wed, 20 Feb 2013 14:51:04 -0600
Subject: [PATCH 2/2] Forgot to add some files to the commit
---
src/drmmode_display.c | 3 +--
src/omap_driver.c | 66 +++++++++++++++++++++++++--------------------------
src/omap_driver.h | 2 +-
src/omap_exa.h | 5 ++--
src/omap_exa_null.c | 4 ++--
5 files changed, 39 insertions(+), 41 deletions(-)
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 14cd33f..6b7c409 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1524,7 +1524,6 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
TRACE_ENTER();
- pScrn->canDoBGNoneRoot = TRUE;
drmmode = calloc(1, sizeof *drmmode);
drmmode->fd = fd;
@@ -1564,7 +1563,7 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
}
void
-drmmode_adjust_frame(ScrnInfoPtr pScrn, int x, int y, int flags)
+drmmode_adjust_frame(ScrnInfoPtr pScrn, int x, int y)
{
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
xf86OutputPtr output = config->output[config->compat_output];
diff --git a/src/omap_driver.c b/src/omap_driver.c
index f343ffb..cb8397a 100644
--- a/src/omap_driver.c
+++ b/src/omap_driver.c
@@ -36,7 +36,7 @@
#endif
#include "omap_driver.h"
-
+#include "compat-api.h"
Bool omapDebug = 0;
@@ -47,19 +47,17 @@ static const OptionInfoRec *OMAPAvailableOptions(int chipid, int busid);
static void OMAPIdentify(int flags);
static Bool OMAPProbe(DriverPtr drv, int flags);
static Bool OMAPPreInit(ScrnInfoPtr pScrn, int flags);
-static Bool OMAPScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
- char **argv);
+static Bool OMAPScreenInit(SCREEN_INIT_ARGS_DECL);
static void OMAPLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
LOCO * colors, VisualPtr pVisual);
-static Bool OMAPCloseScreen(int scrnIndex, ScreenPtr pScreen);
+static Bool OMAPCloseScreen(CLOSE_SCREEN_ARGS_DECL);
static Bool OMAPCreateScreenResources(ScreenPtr pScreen);
-static void OMAPBlockHandler(int i, pointer blockData, pointer pTimeout,
- pointer pReadmask);
-static Bool OMAPSwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
-static void OMAPAdjustFrame(int scrnIndex, int x, int y, int flags);
-static Bool OMAPEnterVT(int scrnIndex, int flags);
-static void OMAPLeaveVT(int scrnIndex, int flags);
-static void OMAPFreeScreen(int scrnIndex, int flags);
+static void OMAPBlockHandler(BLOCKHANDLER_ARGS_DECL);
+static Bool OMAPSwitchMode(SWITCH_MODE_ARGS_DECL);
+static void OMAPAdjustFrame(ADJUST_FRAME_ARGS_DECL);
+static Bool OMAPEnterVT(VT_FUNC_ARGS_DECL);
+static void OMAPLeaveVT(VT_FUNC_ARGS_DECL);
+static void OMAPFreeScreen(FREE_SCREEN_ARGS_DECL);
@@ -668,7 +666,7 @@ OMAPAccelInit(ScreenPtr pScreen)
* save state, initialize the mode, etc.
*/
static Bool
-OMAPScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+OMAPScreenInit(SCREEN_INIT_ARGS_DECL)
{
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
OMAPPtr pOMAP = OMAPPTR(pScrn);
@@ -786,7 +784,7 @@ OMAPScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
/* Take over the virtual terminal from the console, set the desired mode,
* etc.:
*/
- if (!OMAPEnterVT(scrnIndex, 0)) {
+ if (!OMAPEnterVT(VT_FUNC_ARGS(0))) {
ERROR_MSG("OMAPEnterVT() failed!");
goto fail;
}
@@ -856,9 +854,9 @@ OMAPLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
* held by pScrn).
*/
static Bool
-OMAPCloseScreen(int scrnIndex, ScreenPtr pScreen)
+OMAPCloseScreen(CLOSE_SCREEN_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
OMAPPtr pOMAP = OMAPPTR(pScrn);
TRACE_ENTER();
@@ -866,12 +864,12 @@ OMAPCloseScreen(int scrnIndex, ScreenPtr pScreen)
drmmode_screen_fini(pScrn);
if (pScrn->vtSema == TRUE) {
- OMAPLeaveVT(scrnIndex, 0);
+ OMAPLeaveVT(VT_FUNC_ARGS(0));
}
if (pOMAP->pOMAPEXA) {
if (pOMAP->pOMAPEXA->CloseScreen) {
- pOMAP->pOMAPEXA->CloseScreen(scrnIndex, pScreen);
+ pOMAP->pOMAPEXA->CloseScreen(CLOSE_SCREEN_ARGS);
}
}
@@ -893,7 +891,7 @@ OMAPCloseScreen(int scrnIndex, ScreenPtr pScreen)
TRACE_EXIT();
- return (*pScreen->CloseScreen)(scrnIndex, pScreen);
+ return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
}
@@ -920,14 +918,14 @@ OMAPCreateScreenResources(ScreenPtr pScreen)
static void
-OMAPBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
+OMAPBlockHandler(BLOCKHANDLER_ARGS_DECL)
{
- ScreenPtr pScreen = screenInfo.screens[i];
- ScrnInfoPtr pScrn = xf86Screens[i];
+ SCREEN_PTR(arg);
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
OMAPPtr pOMAP = OMAPPTR(pScrn);
swap(pOMAP, pScreen, BlockHandler);
- (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
+ (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
swap(pOMAP, pScreen, BlockHandler);
/* TODO OMAPVideoBlockHandler(), etc.. */
@@ -940,9 +938,9 @@ OMAPBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
* Screen.
*/
static Bool
-OMAPSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+OMAPSwitchMode(SWITCH_MODE_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ SCRN_INFO_PTR(arg);
return xf86SetSingleMode(pScrn, mode, RR_Rotate_0);
}
@@ -954,10 +952,10 @@ OMAPSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
* buffer within the "viewport" of the monitor.
*/
static void
-OMAPAdjustFrame(int scrnIndex, int x, int y, int flags)
+OMAPAdjustFrame(ADJUST_FRAME_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
- drmmode_adjust_frame(pScrn, x, y, flags);
+ SCRN_INFO_PTR(arg);
+ drmmode_adjust_frame(pScrn, x, y);
}
@@ -969,9 +967,9 @@ OMAPAdjustFrame(int scrnIndex, int x, int y, int flags)
* HW state as needed by the X server.
*/
static Bool
-OMAPEnterVT(int scrnIndex, int flags)
+OMAPEnterVT(VT_FUNC_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ SCRN_INFO_PTR(arg);
OMAPPtr pOMAP = OMAPPTR(pScrn);
int i, ret;
@@ -1005,9 +1003,9 @@ OMAPEnterVT(int scrnIndex, int flags)
* need to restore the console's HW state.
*/
static void
-OMAPLeaveVT(int scrnIndex, int flags)
+OMAPLeaveVT(VT_FUNC_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ SCRN_INFO_PTR(arg);
OMAPPtr pOMAP = OMAPPTR(pScrn);
int i, ret;
@@ -1034,9 +1032,9 @@ OMAPLeaveVT(int scrnIndex, int flags)
* up-to-and-including an unsuccessful ScreenInit() call.
*/
static void
-OMAPFreeScreen(int scrnIndex, int flags)
+OMAPFreeScreen(FREE_SCREEN_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ SCRN_INFO_PTR(arg);
OMAPPtr pOMAP = OMAPPTR(pScrn);
TRACE_ENTER();
@@ -1048,7 +1046,7 @@ OMAPFreeScreen(int scrnIndex, int flags)
if (pOMAP->pOMAPEXA) {
if (pOMAP->pOMAPEXA->FreeScreen) {
- pOMAP->pOMAPEXA->FreeScreen(scrnIndex, flags);
+ pOMAP->pOMAPEXA->FreeScreen(FREE_SCREEN_ARGS(pScrn));
}
free(pOMAP->pOMAPEXA);
}
diff --git a/src/omap_driver.h b/src/omap_driver.h
index 3de1802..f0a690e 100644
--- a/src/omap_driver.h
+++ b/src/omap_driver.h
@@ -240,7 +240,7 @@ static inline Bool has_dmm(OMAPPtr pOMAP)
Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
void drmmode_screen_init(ScrnInfoPtr pScrn);
void drmmode_screen_fini(ScrnInfoPtr pScrn);
-void drmmode_adjust_frame(ScrnInfoPtr pScrn, int x, int y, int flags);
+void drmmode_adjust_frame(ScrnInfoPtr pScrn, int x, int y);
int drmmode_page_flip(DrawablePtr draw, uint32_t fb_id, void *priv);
void drmmode_wait_for_event(ScrnInfoPtr pScrn);
Bool drmmode_cursor_init(ScreenPtr pScreen);
diff --git a/src/omap_exa.h b/src/omap_exa.h
index 9980858..b1d4c64 100644
--- a/src/omap_exa.h
+++ b/src/omap_exa.h
@@ -36,6 +36,7 @@
#include "omap_drmif_fb.h"
#include "omap_util.h"
#include "exa.h"
+#include "compat-api.h"
/**
* A per-Screen structure used to communicate and coordinate between the OMAP X
@@ -50,14 +51,14 @@ typedef struct _OMAPEXARec
* generation to free per-Screen data structures (except those held by
* pScrn).
*/
- Bool (*CloseScreen)(int scrnIndex, ScreenPtr pScreen);
+ Bool (*CloseScreen)(CLOSE_SCREEN_ARGS_DECL);
/**
* Called by X driver's FreeScreen() function at the end of each server
* lifetime to free per-ScrnInfoRec data structures, to close any external
* connections (e.g. with PVR2D, DRM), etc.
*/
- void (*FreeScreen)(int scrnIndex, int flags);
+ void (*FreeScreen)(FREE_SCREEN_ARGS_DECL);
/** get formats supported by PutTextureImage() (for dri2 video..) */
#define MAX_FORMATS 16
diff --git a/src/omap_exa_null.c b/src/omap_exa_null.c
index 7d1f295..3c1e683 100644
--- a/src/omap_exa_null.c
+++ b/src/omap_exa_null.c
@@ -77,7 +77,7 @@ PrepareCompositeFail(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
}
static Bool
-CloseScreen(int scrnIndex, ScreenPtr pScreen)
+CloseScreen(CLOSE_SCREEN_ARGS_DECL)
{
#if 0 // TODO need to change CloseScreen/FreeScreen ..
exaDriverFini(pScreen);
@@ -87,7 +87,7 @@ CloseScreen(int scrnIndex, ScreenPtr pScreen)
}
static void
-FreeScreen(int scrnIndex, int flags)
+FreeScreen(FREE_SCREEN_ARGS_DECL)
{
}
--
1.8.1.3

View file

@ -1,22 +1,22 @@
# Maintainer: Kevin Mihelich <kevin@plugapps.com>
# Maintainer: Kevin Mihelich <kevin@archlinuxarm.org>
# Mike Brown <mbrown@archlinuxarm.org>
# OMAP FrameBuffer driver for Xorg
buildarch=4
pkgname="xf86-video-omap-git"
pkgver=0.4.2
pkgname="xf86-video-omap"
pkgver=0.4.3
pkgrel=1
arch=('armv7h')
url="http://cgit.freedesktop.org/xorg/driver/xf86-video-omap/"
license=('GPL2')
makedepends=('pkgconfig' 'xorg-server-devel' 'resourceproto' 'scrnsaverproto')
options=('!libtool')
source=('xf86-video-omap-master.tar.gz')
md5sums=('2e2f4487eb8f2107feedac105c946cb6')
source=('http://cgit.freedesktop.org/xorg/driver/xf86-video-omap/snapshot/xf86-video-omap-0.4.3.tar.gz')
md5sums=('09168250689964ddd7c31442fc353e4c')
build() {
cd "${srcdir}/xf86-video-omap-master"
cd "${srcdir}/xf86-video-omap-${pkgver}"
./autogen.sh
./configure --prefix=/usr
@ -24,9 +24,9 @@ build() {
}
package() {
pkgdesc="OMAP3+ framebuffer driver for X - Git"
pkgdesc="OMAP3+ framebuffer driver for X"
cd "${srcdir}/xf86-video-omap-master"
cd "${srcdir}/xf86-video-omap-${pkgver}"
make DESTDIR="${pkgdir}" install
}

View file

@ -1,64 +1,62 @@
# Contributor: Alessio Biancalana <dottorblaster@gmail.com>
# Maintainer: Xavier Devlamynck <magicrhesus@ouranos.be>
# ALARM: pepedog
# - added --build option to configure
# - added arm.patch
plugrel=1
#ALARM: moonman
# -based on asterisk-ltr in aur
# -added makeflags =-j1, otherwise it fails
# -added asterisk.service for systemd
# -removed dahdi, libpri from deps
# -changed default pid file location to
# /var/run/asterisk (as in asterisk (non ltr) in aur)
# -asterisk.logrotated was forgotten to be included in package - fixed
pkgname=asterisk
pkgver=1.8.2.3
pkgrel=2
pkgdesc="A complete PBX solution"
arch=('i686' 'x86_64')
pkgver=11.2.1
pkgrel=0
pkgdesc="A complete PBX solution (Long Term Support)"
arch=('arm')
groups=()
url="http://www.asterisk.org"
license=('GPL')
depends=('alsa-lib' 'curl' 'gmime' 'iksemel' 'libcap' 'libldap' 'libnewt' 'libusb' \
'libvorbis' 'libxml2' 'net-snmp' 'openssl' 'popt' 'postgresql-libs' 'speex' 'sqlite3' \
'unixodbc' 'python-pip' 'apache' 'php-pear')
makedepends=('postgresql' 'unixodbc' 'sqlite3')
backup=(etc/asterisk/{adsi,agents,ais,alarmreceiver,alsa,amd,app_mysql,asterisk,calendar}.conf
etc/asterisk/{ccss,cdr_adaptive_odbc,cdr,cdr_custom,cdr_manager,cdr_mysql,cdr_odbc,cdr_pgsql,cdr_sqlite3_custom,cdr_syslog}.conf
etc/asterisk/{cdr_tds,cel,cel_custom,cel_odbc,cel_pgsql,cel_sqlite3_custom,cel_tds,chan_dahdi,chan_mobile,chan_ooh323}.conf
etc/asterisk/{cli_aliases,cli,cli_permissions,codecs,console,dbsep,dnsmgr,dsp,dundi,enum}.conf
etc/asterisk/{extconfig,extensions,extensions_minivm,features,followme,func_odbc,gtalk,h323,http,iax,iaxprov}.conf
etc/asterisk/{indications,jabber,jingle,logger,manager,meetme,mgcp,minivm,misdn,modules}.conf
etc/asterisk/{musiconhold,muted,osp,oss,phone,phoneprov,queuerules,queues,res_config_mysql,res_config_sqlite,res_curl}.conf
etc/asterisk/{res_fax,res_ldap,res_odbc,res_pgsql,res_pktccops,res_snmp,res_stun_monitor,rpt,rtp,say,sip,sip_notify}.conf
etc/asterisk/{skinny,sla,smdi,udptl,unistim,usbradio,users,voicemail,vpb}.conf
etc/asterisk/extensions.lua
etc/asterisk/extensions.ael
etc/asterisk/telcordia-1.adsi)
source=(http://downloads.digium.com/pub/asterisk/releases/asterisk-$pkgver.tar.gz
asterisk
asterisk.logrotated
arm.patch)
install=$pkgname.install
md5sums=('e394b63dd71c07497620dc12883e0b80'
'59146273738605f1e011d8e7bed3561a'
'486e07a0a1405ea25ec5b1736034653e'
'28c31f22bd82e15c934e1a704e0d2066')
license=('GPL2')
depends=('libusb' 'libxml2' 'openssl' 'curl' 'gmime' 'iksemel' 'libldap' 'net-snmp' 'postgresql-libs' 'speex' 'sqlite' 'libcap' 'libvorbis' 'unixodbc' 'libnewt' 'libresample' 'alsa-lib' 'popt' 'lua' 'neon' 'jack' 'sdl' 'gsm')
optdepends=('radiusclient-ng' 'libpri' 'dahdi' 'dahdi-tools')
makedepends=('linux-headers')
conflicts=('asterisk' 'asterisk16' 'asterisk18' 'asterisk10' 'asterisk-svn')
provides=('asterisk')
options=(makeflags)
MAKEFLAGS="-j1"
install=${pkgname}.install
source=(http://downloads.asterisk.org/pub/telephony/asterisk/asterisk-${pkgver}.tar.gz
asterisk
asterisk.logrotated
asterisk.service)
sha1sums=('54959f247d7c881507eb08a0d16ffd0f86eef536'
'19ca30d5dde7ba90e56c21abfe4fb9fcf2529e98'
'38a772e20c9a1987faf433ca38c8536012fbada0'
'b4f62266f61dc6f3eef702b8cac548bfc9029a6e')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
patch -Np1 -i ../arm.patch || return 1
[[ $CARCH == "arm" ]] && CONFIGFLAG="--build=arm-unknown-linux-gnueabi"
[[ $CARCH == "armv7h" ]] && CONFIGFLAG="--build=armv7l-unknown-linux-gnueabi"
cd $srcdir/asterisk-${pkgver}
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var $CONFIGFLAG
make || return 1
msg "Configuring..."
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
msg "Building..."
make
}
package(){
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install || return 1
make DESTDIR=${pkgdir} samples || return 1
package() {
cd ${srcdir}/asterisk-${pkgver}
make DESTDIR=${pkgdir} install
make DESTDIR=${pkgdir} samples
cd ${pkgdir}/etc/asterisk
# cp ${srcdir}/modules.conf modules.conf
(cd ${pkgdir}/etc/asterisk
# for i in `ls`; do [ $i = "asterisk.conf" ] || mv $i $i.default; done
ls -I asterisk.conf | xargs -I '{}' mv '{}' '{}.default')
# cp ${srcdir}/modules.conf modules.conf
sed -i -e "s/\/var\/run/\/var\/run\/asterisk/" $startdir/pkg/etc/asterisk/asterisk.conf
install -D -m 755 ${srcdir}/asterisk ${pkgdir}/etc/rc.d/asterisk
install -D -m 644 ${srcdir}/asterisk.logrotated ${pkgdir}/etc/logrotate.d/asterisk
install -D "$srcdir/asterisk" "$pkgdir/etc/rc.d/asterisk"
install -Dm644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
install -Dm644 "$srcdir/asterisk.logrotated" "$pkgdir/etc/logrotate.d/asterisk"
}
# vim:set ts=2 sw=2 et:

View file

@ -1,30 +0,0 @@
diff -urN asterisk-1.8.2.3/main/utils.c asterisk-1.8.2.3-2/main/utils.c
--- asterisk-1.8.2.3/main/utils.c 2011-01-20 19:47:11.000000000 +0000
+++ asterisk-1.8.2.3-2/main/utils.c 2011-04-24 20:34:55.000000000 +0100
@@ -24,6 +24,8 @@
*/
#include "asterisk.h"
+/* Temporary declaration for ARM cpus ONLY (this belongs in the make environment) */
+#define __arm__ 1
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 303104 $")
@@ -1632,7 +1634,7 @@
}
result = (*pool_head)->base + (*pool_head)->used;
-#ifdef __sparc__
+#if defined(__sparc__) || defined(__arm__)
/* SPARC requires that the allocation field be aligned. */
if ((long) result % sizeof(ast_string_field_allocation)) {
result++;
@@ -1713,7 +1715,7 @@
}
} else {
target = (*pool_head)->base + (*pool_head)->used + sizeof(ast_string_field_allocation);
-#ifdef __sparc__
+#if defined(__sparc__) || defined(__arm__)
if ((long) target % sizeof(ast_string_field_allocation)) {
target++;
space--;

View file

@ -13,7 +13,7 @@ post_install() {
cat << EOF
>>>
>>> To get Music on Hold working do pacman -S mpg123
>>> To get the postgresql, unixodbc or sqlite2 modules working
>>> To get the postgresql, unixodbc or sqlite modules working
>>> download the respective package and modify modules.conf to reflect
>>> your changes.
>>>

View file

@ -0,0 +1,19 @@
[Unit]
Description=Asterisk PBX and telephony daemon.
After=network.target
[Service]
Type=simple
Environment=HOME=/var/lib/asterisk
WorkingDirectory=/var/lib/asterisk
User=asterisk
Group=asterisk
PIDFile=/run/asterisk/asterisk.pid
ExecStart=/usr/sbin/asterisk -C /etc/asterisk/asterisk.conf
ExecStop=/usr/sbin/asterisk -rx 'core stop now'
ExecReload=/usr/sbin/asterisk -rx 'core reload'
PrivateTmp=true
[Install]
WantedBy=multi-user.target

48
aur/compton-git/PKGBUILD Normal file
View file

@ -0,0 +1,48 @@
# Maintainer: OK100 <ok100@lavabit.com>
# Previous Maintainer: Valère Monseur <valere dot monseur at ymail dot com>
pkgname=compton-git
pkgver=20121204
pkgrel=1
pkgdesc="X Compositor (a fork of xcompmgr-dana)"
arch=(i686 x86_64)
url="https://github.com/chjj/compton"
license=('MIT')
depends=('libx11' 'libxcomposite' 'libxdamage' 'libxfixes' 'libxext' 'libxrender' 'xproto' 'bash' 'xorg-xprop' 'xorg-xwininfo' 'pcre' 'libconfig' 'mesa' 'libxrandr')
makedepends=('git' 'make' 'pkg-config' 'asciidoc')
_gitroot="git://github.com/chjj/compton.git"
_gitname="compton"
build() {
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 make..."
rm -rf "$srcdir/$_gitname-build"
git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
cd "$srcdir/$_gitname-build"
make PREFIX=/usr
make docs
}
package() {
cd $_gitname-build
make PREFIX="$pkgdir/usr" install
# install license
install -D -m644 "LICENSE" "$pkgdir/usr/share/licenses/$_gitname/LICENSE"
# example conf
install -D -m644 "compton.sample.conf" "$pkgdir/etc/xdg/compton.conf.example"
}

View file

@ -0,0 +1,55 @@
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
pkgname=despotify-svn
pkgver=521
pkgrel=1
pkgdesc="Console client for Spotify (development version)"
arch=('x86_64' 'i686')
url="http://despotify.sourceforge.net/"
license=('BSD')
depends=('libvorbis' 'openssl' 'libao>=1.1.0' 'mpg123')
makedepends=('subversion' 'ncurses' 'libtool' 'expat')
conflicts=('despotify-pulse-svn' 'despotify-ao-svn')
install=despotify.install
_svntrunk=https://despotify.svn.sourceforge.net/svnroot/despotify
_svnmod=despotify
build() {
cd "$srcdir"
if [ -d "$_svnmod/.svn" ]; then
(cd "$_svnmod" && svn up -r "$pkgver")
else
svn co "$_svntrunk" --config-dir ./ -r "$pkgver" "$_svnmod"
fi
msg "SVN checkout done or server timeout"
cd "$_svnmod/src"
msg2 "Configuring..."
# Use libao
sed -i 's/gstreamer/libao/' Makefile.local.mk.dist
cp Makefile.local.mk.dist Makefile.local.mk
# anti-segfault fix, adding format.matrix = NULL; to libao.c
sed -i 's/_LITTLE;/_LITTLE; format.matrix = NULL;/' \
clients/despotify/libao.c
msg2 "Compiling..."
make
}
package() {
cd "$_svnmod/src"
# The installer fails to make these directories
mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/include"
# Install to the pkgdir
make INSTALL_PREFIX="$pkgdir/usr" DESTDIR="$pkgdir/" install
# Shouldn't be executable, fixing
chmod -x "$pkgdir/usr/include/despotify.h"
}
# vim:set ts=2 sw=2 et:

View file

@ -0,0 +1,11 @@
post_upgrade() {
echo 'NOTE:'
echo 'If you use PulseAudio and get no sound, try as root:'
echo 'setconf /etc/libao.conf default_driver pulse'
}
post_install() {
post_upgrade
}
# vim:set ts=2 sw=2 et:

35
aur/dtc/PKGBUILD Normal file
View file

@ -0,0 +1,35 @@
# For ArchLinux by Joël Porquet
pkgname=dtc
pkgver=20120614
pkgrel=1
pkgdesc="Device Tree Compiler"
url="http://jdl.com/software/"
arch=('i686' 'x86_64')
license=('GPL2')
makedepends=('git')
_gitroot='http://jdl.com/software/dtc.git/'
_gitname='dtc'
build() {
msg 'Connecting to GIT server...'
if [[ -d ${_gitname} ]]
then
cd ${_gitname}
git pull
else
git clone ${_gitroot}
fi
msg 'GIT checkout done or server timeout'
}
package() {
cd ${_gitname}
make || return 1
make INSTALL=$(which install) DESTDIR=${pkgdir} PREFIX=/usr install || return 1
}

View file

@ -2,7 +2,7 @@
# Maintainer: Nathan Owe <ndowens.aur at gmail dot com>
pkgname=flexget
_pkgname=FlexGet
pkgver=1.0r3214
pkgver=1.0.3288
pkgrel=2
pkgdesc="Automate downloading or processing content (torrents, podcasts, etc.)"
arch=(any)
@ -10,13 +10,13 @@ url="http://flexget.com/"
depends=('python2' 'python2-cherrypy' 'python2-progressbar' \
'python2-pynzb' 'pyrss2gen' 'python2-sqlalchemy' 'python2-html5lib' \
'python2-beautifulsoup4>=4.1' 'python2-beautifulsoup3>=3.2' 'python2-yaml' 'python2-feedparser'
'python2-flask' 'python2-requests-0.14' 'python2-certifi>=0.0.7'
'python2-flask' 'python2-requests' 'python2-certifi>=0.0.7'
'python2-chardet>=1.0.0' 'python2-dateutil')
optdepends=('pytransmissionrpc: Transmission support')
makedepends=('python2-distribute')
license=('MIT')
#install=('flexget.install')
source=("http://download.flexget.com/unstable/${_pkgname}-${pkgver}.tar.gz")
source=("http://download.flexget.com/${_pkgname}-${pkgver}.tar.gz")
package() {
cd "${srcdir}/${_pkgname}-${pkgver}"
@ -29,4 +29,4 @@ package() {
}
md5sums=('60a6ca61dc34ba2d0cde44eb13cbca38')
md5sums=('34e7032ac1d76a35bbfd31f6335ca138')

31
aur/iksemel/PKGBUILD Normal file
View file

@ -0,0 +1,31 @@
# $Id: PKGBUILD 55571 2011-09-14 10:35:20Z andrea $
# Maintainer: Mateusz Herych <heniekk@gmail.com>
# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
# Contributor: Guillermo Vaya driadan@willinux.net
pkgname=iksemel
pkgver=1.4
pkgrel=2
pkgdesc="XML parser library for Jabber applications in ANSI C"
arch=('arm')
url="http://code.google.com/p/iksemel/"
license=('LGPL')
depends=('glibc')
install=iksemel.install
source=("http://iksemel.googlecode.com/files/${pkgname}-$pkgver.tar.gz")
md5sums=('532e77181694f87ad5eb59435d11c1ca')
options=('!libtool')
build() {
cd "${srcdir}"/$pkgname-$pkgver
./configure --prefix=/usr \
--infodir=/usr/share/info
make
}
package() {
cd "${srcdir}"/$pkgname-$pkgver
make DESTDIR="${pkgdir}" install
mv "${pkgdir}"/usr/share/info/$pkgname "${pkgdir}"/usr/share/info/$pkgname.info
rm -rf "${pkgdir}"/usr/share/info/dir
}

View file

@ -0,0 +1,20 @@
infodir=usr/share/info
filelist=(iksemel.info.gz)
post_install() {
[ -x usr/bin/install-info ] || return 0
for file in ${filelist[@]}; do
install-info $infodir/$file $infodir/dir 2> /dev/null
done
}
post_upgrade() {
post_install $1
}
pre_remove() {
[ -x usr/bin/install-info ] || return 0
for file in ${filelist[@]}; do
install-info --delete $infodir/$file $infodir/dir 2> /dev/null
done
}

View file

@ -0,0 +1,14 @@
diff -Nur libresample-0.1.3.orig/Makefile.in libresample-0.1.3/Makefile.in
--- libresample-0.1.3.orig/Makefile.in 2003-10-12 17:05:59.000000000 +1000
+++ libresample-0.1.3/Makefile.in 2009-08-24 08:43:16.000000000 +1000
@@ -20,6 +20,10 @@
TARGETS = @TARGETS@
DIRS=tests
+ifeq ($(shell uname -m),x86_64)
+ CFLAGS += -fPIC
+endif
+
all: $(TARGETS)
libresample.a: $(OBJS) Makefile

24
aur/libresample/PKGBUILD Normal file
View file

@ -0,0 +1,24 @@
# Contributor: Jonathan Liu <net147@gmail.com>
pkgname=libresample
pkgver=0.1.3
pkgrel=2
pkgdesc="A real-time library for audio sampling rate conversion"
arch=('arm')
url="http://ccrma.stanford.edu/~jos/resample/Free_Resampling_Software.html"
license=('LGPL2')
source=("http://ccrma.stanford.edu/~jos/gz/$pkgname-$pkgver.tgz"
"Makefile.in.patch")
md5sums=('99bc5ea15ef76b83e5655a10968f674b'
'9c18aec34f5e16baac888bd0926270e7')
build() {
cd "$srcdir/$pkgname-$pkgver"
patch -Np1 -i "$srcdir/Makefile.in.patch" || return 1
./configure --prefix=/usr
make libresample.a || return 1
install -D -m644 include/libresample.h "$pkgdir/usr/include/libresample.h"
install -D -m644 libresample.a "$pkgdir/usr/lib/libresample.a"
}
# vim:set ts=2 sw=2 et:

View file

@ -1,8 +1,8 @@
# Maintainer: Padfoot <padfoot at exemail dot com dot au>
pkgname=lightdm-gtk-greeter
pkgver=1.3.1
pkgrel=1
pkgver=1.5.0
pkgrel=2
pkgdesc="GTK+ greeter for LightDM"
arch=('i686'
'x86_64')
@ -20,14 +20,19 @@ conflicts=('lightdm-gtk-greeter-osk'
'lightdm-gtk-greeter-bzr')
backup=('etc/lightdm/lightdm-gtk-greeter.conf')
install='lightdm-gtk-greeter.install'
source=("https://launchpad.net/$pkgname/1.4/$pkgver/+download/$pkgname-$pkgver.tar.gz"
"lightdm-gtk-greeter.conf")
md5sums=('f7e05d1057afb7728197f11c328d4ba2'
'ca8634dfc2cc8a78546eaf27e95810f2')
source=("https://launchpad.net/$pkgname/1.6/$pkgver/+download/$pkgname-$pkgver.tar.gz"
"lightdm-gtk-greeter.conf"
"lightdm-gtk-greeter.patch")
md5sums=('226fbc12594cca01d5decabde1d42f2d'
'76b48440baf59713304d6ea71ecdc325'
'80555121f1f6b7b284308cb8122128fc')
build() {
cd "$srcdir/$pkgname-$pkgver"
export AUTOMAKE=automake
patch -p1 -i $srcdir/lightdm-gtk-greeter.patch
./autogen.sh --prefix=/usr \
--sysconfdir=/etc \
--libexecdir=/usr/lib/lightdm \

View file

@ -4,7 +4,6 @@
# theme-name = GTK+ theme to use
# icon-theme-name = Icon theme to use
# font-name = Font to use
# cursor-name = Cursor theme to use
# xft-antialias = Whether to antialias Xft fonts (true or false)
# xft-dpi = Resolution for Xft in dots per inch (e.g. 96)
# xft-hintstyle = What degree of hinting to use (hintnone, hintslight, hintmedium, or hintfull)
@ -17,7 +16,6 @@ background=#000000
theme-name=default
icon-theme-name=default
font-name=Sans Regular 11
cursor-name=default
xft-antialias=true
xft-dpi=96
xft-hintstyle=slight

View file

@ -0,0 +1,11 @@
diff -aur lightdm-gtk-greeter-1.5.0.src/src/lightdm-gtk-greeter.c lightdm-gtk-greeter-1.5.0.patch/src/lightdm-gtk-greeter.c
--- lightdm-gtk-greeter-1.5.0.src/src/lightdm-gtk-greeter.c 2013-01-25 01:31:00.000000000 +1100
+++ lightdm-gtk-greeter-1.5.0.patch/src/lightdm-gtk-greeter.c 2013-01-30 19:42:27.612325811 +1100
@@ -872,6 +872,7 @@
g_warning ("Failed to load background: %s", error->message);
g_clear_error (&error);
g_free (path);
+ default_background_pixbuf=gdk_pixbuf_add_alpha (default_background_pixbuf,FALSE,255,255,255);
}
else
{

View file

@ -1,7 +1,9 @@
#Mantainer: M0Rf30
#Contributor: ossfm
#Contributor: shosca
pkgname=lightdm
pkgver=1.4.0
pkgrel=6
pkgrel=8
pkgdesc="A lightweight display manager"
arch=('i686' 'x86_64')
url="https://launchpad.net/lightdm"
@ -12,7 +14,10 @@ source=("https://launchpad.net/lightdm/1.4/$pkgver/+download/$pkgname-$pkgver.ta
lightdm.tmpfiles
xsession
lightdm-autologin.pam
lightdm.pam)
lightdm.pam
lightdm.rules
lightdm-1.4.0-systemd_login1_power.patch
lightdm-lock-screen-before-switch.patch)
depends=('dbus-glib' 'libxklavier')
options=(!libtool)
install=lightdm.install
@ -36,6 +41,10 @@ backup=(etc/apparmor.d/lightdm-guest-session
build() {
cd $srcdir/$pkgname-$pkgver
patch -p1 -i ../lightdm-1.4.0-systemd_login1_power.patch
patch -p1 -i ../lightdm-lock-screen-before-switch.patch
./configure --prefix=/usr \
--sysconfdir=/etc --disable-static --libexecdir=/usr/lib/lightdm \
--localstatedir=/var --with-greeter-user=lightdm \
@ -66,6 +75,10 @@ package() {
# Doing Autologin and security fixes
cp ../lightdm-autologin.pam $pkgdir/etc/pam.d/lightdm-autologin
cp ../lightdm.pam $pkgdir/etc/pam.d/lightdm
sed 's#\[UserAccounts\]#\[UserList\]#g' -i $pkgdir/etc/lightdm/users.conf
install -d -m700 $pkgdir/usr/share/polkit-1/rules.d/
install -m644 ../lightdm.rules $pkgdir/usr/share/polkit-1/rules.d/lightdm.rules
}
md5sums=('622d9087ec773dd0626a250a5868f88c'
@ -74,4 +87,7 @@ md5sums=('622d9087ec773dd0626a250a5868f88c'
'b1e1baf7351ff58c7b3b9b204472f6bb'
'683bc8bc3f423157065dc6295f9fecef'
'9e39da461e36f9d3fdd4447a80ebd878'
'a5c60ec8739a698e4127b47ef417e517')
'a5c60ec8739a698e4127b47ef417e517'
'2a7326f4de1d949b8c96749b62cc5021'
'1aac33da4bb5d6c5bb2b8fa72ae922b9'
'43314fcf13397aaf2321a86d7ed9452c')

View file

@ -0,0 +1,209 @@
diff -up lightdm-1.4.0/liblightdm-gobject/power.c.systemd_login1_power lightdm-1.4.0/liblightdm-gobject/power.c
--- lightdm-1.4.0/liblightdm-gobject/power.c.systemd_login1_power 2011-12-08 19:51:23.000000000 -0600
+++ lightdm-1.4.0/liblightdm-gobject/power.c 2013-01-10 22:34:41.782151231 -0600
@@ -18,6 +18,7 @@
static GDBusProxy *upower_proxy = NULL;
static GDBusProxy *ck_proxy = NULL;
+static GDBusProxy *login1_proxy = NULL;
static gboolean
upower_call_function (const gchar *function, gboolean default_result, GError **error)
@@ -148,6 +149,59 @@ ck_call_function (const gchar *function,
return function_result;
}
+static gboolean
+login1_call_function (const gchar *function, GVariant *parameters, gboolean default_result, GError **error)
+{
+ GVariant *result;
+ gboolean function_result = FALSE;
+ const gchar *true_result = "yes";
+ gchar *str_result;
+
+ if (!login1_proxy)
+ {
+ login1_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+ G_DBUS_PROXY_FLAGS_NONE,
+ NULL,
+ "org.freedesktop.login1",
+ "/org/freedesktop/login1",
+ "org.freedesktop.login1.Manager",
+ NULL,
+ error);
+ if (!login1_proxy)
+ return FALSE;
+ }
+
+ result = g_dbus_proxy_call_sync (login1_proxy,
+ function,
+ parameters,
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ NULL,
+ error);
+
+ if (!result)
+ return default_result;
+
+ if (g_variant_is_of_type (result, G_VARIANT_TYPE ("(b)")))
+ g_variant_get (result, "(s)", &function_result);
+
+ /**
+ * CanReboot, CanPowerOff returns a string "yes", "no", or "challenge", not a boolean as ConsoleKit
+ **/
+ if (g_variant_is_of_type (result, G_VARIANT_TYPE ("(s)"))) {
+ g_variant_get (result, "(b)", str_result);
+ if(g_strcmp0(str_result,true_result) == 0) {
+ function_result = TRUE;
+ }
+ else {
+ function_result = default_result;
+ }
+ }
+
+ g_variant_unref (result);
+ return function_result;
+}
+
/**
* lightdm_get_can_restart:
*
@@ -158,7 +212,11 @@ ck_call_function (const gchar *function,
gboolean
lightdm_get_can_restart (void)
{
- return ck_call_function ("CanRestart", FALSE, NULL);
+ gboolean function_result = FALSE;
+ function_result = login1_call_function ("CanReboot", NULL, FALSE, NULL);
+ if (!function_result)
+ function_result = ck_call_function ("CanRestart", FALSE, NULL);
+ return function_result;
}
/**
@@ -172,7 +230,11 @@ lightdm_get_can_restart (void)
gboolean
lightdm_restart (GError **error)
{
- return ck_call_function ("Restart", TRUE, error);
+ gboolean function_result = FALSE;
+ function_result = login1_call_function ("Reboot", g_variant_new("(b)",0), TRUE, error);
+ if (!function_result)
+ function_result = ck_call_function ("Restart", TRUE, error);
+ return function_result;
}
/**
@@ -185,7 +247,11 @@ lightdm_restart (GError **error)
gboolean
lightdm_get_can_shutdown (void)
{
- return ck_call_function ("CanStop", FALSE, NULL);
+ gboolean function_result = FALSE;
+ function_result = login1_call_function ("CanPowerOff", NULL, FALSE, NULL);
+ if (!function_result)
+ function_result = ck_call_function ("CanStop", FALSE, NULL);
+ return function_result;
}
/**
@@ -199,5 +265,9 @@ lightdm_get_can_shutdown (void)
gboolean
lightdm_shutdown (GError **error)
{
- return ck_call_function ("Stop", TRUE, error);
+ gboolean function_result = FALSE;
+ function_result = login1_call_function ("PowerOff", g_variant_new("(b)",0), TRUE, error);
+ if (!function_result)
+ function_result = ck_call_function ("Stop", TRUE, error);
+ return function_result;
}
diff -up lightdm-1.4.0/liblightdm-qt/power.cpp.systemd_login1_power lightdm-1.4.0/liblightdm-qt/power.cpp
--- lightdm-1.4.0/liblightdm-qt/power.cpp.systemd_login1_power 2011-12-08 19:51:23.000000000 -0600
+++ lightdm-1.4.0/liblightdm-qt/power.cpp 2013-01-10 22:57:15.458512125 -0600
@@ -16,6 +16,7 @@
#include <QtCore/QVariant>
#include <QtDBus/QDBusInterface>
#include <QtDBus/QDBusReply>
+#include <QDebug>
#include "config.h"
@@ -27,11 +28,13 @@ public:
PowerInterfacePrivate();
QScopedPointer<QDBusInterface> powerManagementInterface;
QScopedPointer<QDBusInterface> consoleKitInterface;
+ QScopedPointer<QDBusInterface> login1Interface;
};
PowerInterface::PowerInterfacePrivate::PowerInterfacePrivate() :
powerManagementInterface(new QDBusInterface("org.freedesktop.UPower","/org/freedesktop/UPower", "org.freedesktop.UPower", QDBusConnection::systemBus())),
- consoleKitInterface(new QDBusInterface("org.freedesktop.ConsoleKit", "/org/freedesktop/ConsoleKit/Manager", "org.freedesktop.ConsoleKit.Manager", QDBusConnection::systemBus()))
+ consoleKitInterface(new QDBusInterface("org.freedesktop.ConsoleKit", "/org/freedesktop/ConsoleKit/Manager", "org.freedesktop.ConsoleKit.Manager", QDBusConnection::systemBus())),
+ login1Interface(new QDBusInterface("org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1.Manager", QDBusConnection::systemBus()))
{
}
@@ -81,34 +84,53 @@ void PowerInterface::hibernate()
bool PowerInterface::canShutdown()
{
+ if ( d->login1Interface->isValid() ) {
+ QDBusReply<QString> reply1 = d->login1Interface->call("CanPowerOff");
+ if (reply1.isValid()) {
+ return (reply1.value()=="yes");
+ }
+ }
+ qWarning() << d->login1Interface->lastError();
+
QDBusReply<bool> reply = d->consoleKitInterface->call("CanStop");
if (reply.isValid()) {
return reply.value();
}
- else {
- return false;
- }
+ return false;
}
void PowerInterface::shutdown()
{
- d->consoleKitInterface->call("Stop");
+ if ( d->login1Interface->isValid() )
+ d->login1Interface->call("PowerOff",false);
+ else
+ d->consoleKitInterface->call("Stop");
}
bool PowerInterface::canRestart()
{
+ if ( d->login1Interface->isValid() ) {
+ QDBusReply<QString> reply1 = d->login1Interface->call("CanReboot");
+ if (reply1.isValid()) {
+ return (reply1.value()=="yes");
+ }
+ }
+ qWarning() << d->login1Interface->lastError();
+
QDBusReply<bool> reply = d->consoleKitInterface->call("CanRestart");
if (reply.isValid()) {
return reply.value();
}
- else {
- return false;
- }
+
+ return false;
}
void PowerInterface::restart()
{
- d->consoleKitInterface->call("Restart");
+ if ( d->login1Interface->isValid() )
+ d->login1Interface->call("Reboot",false);
+ else
+ d->consoleKitInterface->call("Restart");
}
#include "power_moc.cpp"

View file

@ -0,0 +1,55 @@
# HG changeset patch
# Parent b329fa1badaa454239690c3feb93d53324134915
try to lock the screen before switching users
diff --git a/utils/gdmflexiserver b/utils/gdmflexiserver
--- a/utils/gdmflexiserver
+++ b/utils/gdmflexiserver
@@ -9,9 +9,47 @@
#
# See http://www.gnu.org/copyleft/gpl.html for the full text of the license.
+PATH=/usr/local/bin:/bin:/usr/bin
+export PATH
+
if [ -z "$XDG_SEAT_PATH" ]; then
# something went wrong
exit 1
fi
+find_command () {
+ cmd="$1"
+ oIFS="${IFS}"; IFS=:
+ set -- ${PATH}
+ IFS="${oIFS}"
+
+ for part; do
+ [ -x "${part}/${cmd}" ] && return 0
+ done
+ return 1
+}
+
+lock_screen () {
+ for lock_cmd in \
+ "xscreensaver-command -lock" \
+ "gnome-screensaver-command --lock" \
+ "dbus-send --session --dest=org.freedesktop.ScreenSaver --type=method_call /ScreenSaver org.freedesktop.ScreenSaver.Lock"
+ do
+ ${lock_cmd} >/dev/null 2>&1 && return
+ done
+
+ for lock_cmd in \
+ "slock" \
+ "xlock -mode blank"
+ do
+ set -- ${lock_cmd}
+ if find_command "$1"; then
+ ${lock_cmd} >/dev/null 2>&1 &
+ return
+ fi
+ done
+}
+
+lock_screen
+
dbus-send --system --type=method_call --print-reply --dest=org.freedesktop.DisplayManager $XDG_SEAT_PATH org.freedesktop.DisplayManager.Seat.SwitchToGreeter

15
aur/lightdm/lightdm.rules Normal file
View file

@ -0,0 +1,15 @@
polkit.addRule(function(action, subject) {
if (subject.user == "lightdm") {
polkit.log("action=" + action);
polkit.log("subject=" + subject);
if (action.id.indexOf("org.freedesktop.login1.") == 0) {
return polkit.Result.YES;
}
if (action.id.indexOf("org.freedesktop.consolekit.system.") == 0) {
return polkit.Result.YES;
}
if (action.id.indexOf("org.freedesktop.upower.") == 0) {
return polkit.Result.YES;
}
}
});

View file

@ -0,0 +1,45 @@
# This is a mjpg-streamer PKGBUILD file.
# Contributor: Tri Le <trile7@gmail.com>
pkgname=mjpg-streamer-svn
pkgver=115
pkgrel=2
pkgdesc="Stream mjpeg frames from a webcam via http"
arch=('i686' 'x86_64')
url="http://sourceforge.net/projects/mjpg-streamer"
license=('GPL')
depends=('libjpeg')
conflicts=("mjpg-streamer")
makedepends=("subversion" "imagemagick")
svnmod=mjpg-streamer
svntrunk=https://"$svnmod".svn.sourceforge.net/svnroot/"$svnmod"/"$svnmod"
build() {
cd "$srcdir"
if [ -d $svnmod/.svn ]; then
(cd $svnmod && svn up -r $pkgver)
else
svn co $svntrunk --config-dir ./ -r $pkgver $svnmod
fi
msg "SVN checkout done or server timeout"
msg "Starting make..."
rm -rf "$srcdir/$svnmod-build"
cp -r "$srcdir/$svnmod" "$srcdir/$svnmod-build"
cd "$srcdir/$svnmod-build"
find . -type f -print0 | xargs -0 sed -i s/videodev.h/videodev2.h/g
sed -i "s/PLUGINS += input_gspcav1.so/# PLUGINS += input_gspcav1.so/" Makefile
# BUILD
make clean all || return 1
mkdir -p $pkgdir/usr/share/$svnmod/www/
mkdir -p $pkgdir/usr/lib
install *.so $pkgdir/usr/lib/
install -m 644 www/* $pkgdir/usr/share/$svnmod/www/
install -m 755 www/functions.js $pkgdir/usr/share/$svnmod/www/
mkdir -p $pkgdir/usr/bin
install mjpg_streamer $pkgdir/usr/bin/
install -m 644 CHANGELOG LICENSE README start.sh $pkgdir/usr/share/$svnmod/
}

View file

@ -1,19 +1,27 @@
#Maintainer: Christian Stankowic <info at stankowic hypen development dot net>
#Contributor: Gary Wright <wriggary at gmail dot com>
#ALARM: moonman
# -added .service file for systemd
# -changed default port to 80 (required by .service)
# -changed pid file dir from /var/log to /var/run/monkey
pkgname=monkey
pkgver=1.1.1
pkgrel=1
pkgrel=2
pkgdesc="A very small and fast open source web server for Linux"
arch=('i686' 'x86_64')
arch=('arm')
url="http://www.monkey-project.com/"
license=('GPL2')
depends=('gcc-libs')
optdepends=('php')
source=("http://www.monkey-project.com/releases/1.1/$pkgname-$pkgver.tar.gz"
monkey)
monkey
monkey.service)
install=monkey.install
md5sums=('958d74ddcc595ae01b1d3916e9e7753c'
'1527d1fbddddcfd69ad328639dcd0eed')
'1527d1fbddddcfd69ad328639dcd0eed'
'7881f60a6e9c4b2a43a6fe0d7b251362')
build() {
cd $srcdir/$pkgname-$pkgver
@ -22,6 +30,14 @@ build() {
--plugdir=/usr/lib/$pkgname
make
make DESTDIR=$pkgdir install
install -d $pkgdir/etc/rc.d/
#change default pid file location from /var/log to /var/run/monkey
sed -i -e "s/\/var\/log\/monkey\/monkey.pid/\/var\/run\/monkey\/monkey.pid/" $startdir/pkg/etc/monkey/monkey.conf
#change default port to 80
sed -i -e "s/Port\ 2001/Port\ 80/" $startdir/pkg/etc/monkey/monkey.conf
install -d $pkgdir/etc/rc.d/
install -m 755 ../monkey $pkgdir/etc/rc.d/monkey
install -Dm644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
}

View file

@ -1,14 +1,14 @@
post_install() {
mkdir -p var/run/monkey
chmod 755 var/run/monkey
env echo
env echo " Running Monkey :"
env echo " ----------------"
env echo
env echo " # /usr/bin/monkey"
env echo
env echo " For more help use '-h' option"
env echo
env echo " System wide rc script located at:"
env echo
env echo " # /etc/rc.d/monkey {start|stop|restart}"
env echo " For more help use '-h' option"
}

13
aur/monkey/monkey.service Normal file
View file

@ -0,0 +1,13 @@
[Unit]
Description=Monkey http server deamon
After=network.target
[Service]
Type=forking
ExecStart=/usr/bin/monkey -D
ExecStop=/bin/kill $MAINPID
ExecReload=/bin/kill $MAINPID ; /usr/bin/monkey -D
PIDFile=/var/run/monkey/monkey.pid.80
[Install]
WantedBy=multi-user.target

View file

@ -5,32 +5,33 @@
# Contributor: Farhan Yousaf <farhany at xaviya dot com>
pkgname=netatalk
pkgver=3.0.1
pkgrel=5
pkgver=3.0.2
pkgrel=1
pkgdesc='A kernel-level implementation of AFP services'
arch=('i686' 'x86_64')
url='http://netatalk.sourceforge.net'
license=('GPL')
depends=('avahi>=0.6' 'libldap' 'libgcrypt>=1.2.3' 'libevent')
replaces=('netatalk-git' 'netatalk2')
backup=('etc/afp.conf')
backup=('etc/afp.conf'
'etc/extmap.conf')
options=('!libtool')
install=$pkgname.install
changelog=$pkgname.changelog
source=(http://iweb.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
md5sums=('b4f5c932b2ca99f5292bd6b6d69b3ebc')
md5sums=('b5f1c2c4b3a5e64f5bca219415aa1c75')
build() {
cd $pkgname-$pkgver
msg2 'Fixing...'
sed -i 's/x"linux/x"generic/' macros/netatalk.m4
sed -i -e 's:AC_CONFIG_SUBDIRS:#AC_CONFIG_SUBDIRS:' -e 's/x"linux/x"generic/' macros/netatalk.m4
sed -i 's:/lib:/usr/lib:' distrib/initscripts/Makefile.{am,in}
sed -i 's:model=%s:model:' etc/afpd/afp_mdns.c
sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' {configure.ac,libevent/configure.in}
cp /usr/share/automake*/missing .
autoreconf -i >/dev/null
msg2 'Configuring...'
CFLAGS="-Wno-unused-result" ./configure --prefix=/usr --localstatedir=/var/state --sysconfdir=/etc --with-init-style=systemd \
--with-cracklib --with-cnid-cdb-backend --enable-pgp-uam --without-libevent-header --without-libevent-lib
--with-cracklib --with-cnid-cdb-backend --enable-pgp-uam --with-libevent=no
sed -i -e s/-Ino// -e s/-Lno// etc/netatalk/Makefile
msg2 'Making...'
make >/dev/null

View file

@ -1,3 +1,10 @@
2013-01-27 SJ_UnderWater
* 3.0.2-1:
package update
libevent fix
copy newer ./missing
2013-01-05 SJ_UnderWater
* 3.0.1-5:

View file

@ -17,5 +17,5 @@ post_upgrade() {
if [ -f /opt/netatalk/afp_signature.conf ] ||
[ -f /opt/netatalk/afp_voluuid.conf ]; then
echo '>>> Found *.conf in /opt/netatalk, please';
echo '>>> migrate these to /etc/netatalk before restarting';fi
echo '>>> migrate these to /var/state/netatalk before restarting';fi
}

View file

@ -1,11 +1,11 @@
# Maintainer: Jouke Witteveen <j.witteveen@gmail.com>
pkgname=netctl
pkgver=0.2
pkgrel=1
pkgver=0.3
pkgrel=3
arch=(any)
pkgdesc="Network configuration and profile scripts"
url="http://archlinux.org/netctl/"
url="http://projects.archlinux.org/netctl.git/"
license=("GPL")
depends=("coreutils" "iproute2" "openresolv")
makedepends=('asciidoc')
@ -18,20 +18,20 @@ optdepends=('dialog: for the menu based wifi assistant'
'ifenslave: for bond connections'
'bridge-utils: for bridge connections'
)
conflicts=("netcfg" "netctl")
provides=("netctl")
conflicts=("netcfg")
provides=("netcfg")
source=("https://github.com/joukewitteveen/$pkgname/archive/$pkgver.tar.gz"
source=("ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.gz"
'zsh-completion')
md5sums=('cb144eda0e5dd09f5b07db00421a429f'
'3428e0e7f061bbcde41f2fe64d8d96dd')
package() {
cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
make -C "$srcdir/$pkgver" DESTDIR="$pkgdir" install
# Shell Completion
install -D -m644 contrib/bash-completion "$pkgdir/usr/share/bash-completion/completions/netctl"
install -Dm644 "$srcdir/$pkgver/contrib/bash-completion" "$pkgdir/usr/share/bash-completion/completions/netctl"
install -Dm644 "$srcdir/zsh-completion" "$pkgdir/usr/share/zsh/site-functions/_netctl"
}
md5sums=('c5db1be925036ae4bd448088119e432c'
'3428e0e7f061bbcde41f2fe64d8d96dd')

View file

@ -1,7 +1,7 @@
# Contributor: plut0nium <charles(DOT)fourneau(AT)gmail(DOT)com >
# tzervo <tzervo@gmail.com>
pkgname="owfs"
pkgver=2.8p20
pkgver=2.8p21
pkgrel=1
pkgdesc="An easy way to use the powerful 1-wire system of Dallas/Maxim."
arch=('any')
@ -21,7 +21,7 @@ options=()
install=
source=(http://downloads.sourceforge.net/sourceforge/owfs/$pkgname-$pkgver.tar.gz)
noextract=()
md5sums=('9aebee6c0e724553f5be6a542494eae5')
md5sums=('372361dc6316fcadc80029626f6c3d7f')
build() {
cd "$srcdir/$pkgname-$pkgver"

View file

@ -1,7 +1,11 @@
# Maintainer: Antonio Rojas <nqn1976 @ gmail.com>
# Based on owncloud-git PKGBUILD by Alexander Ovsyannikov
<<<<<<< HEAD
# ALARM Maintainer: Tommaso Sardelli <lacapannadelloziotom@gmail.com
=======
# ALARM Maintainer: Tommaso Sardelli <lacapannadelloziotom@gmail.com>
>>>>>>> upstream/master
pkgname=owncloud
pkgver=4.5.7

View file

@ -1,23 +0,0 @@
# Maintainer: Mihai Militaru <mihai militaru at xmpp dot ro>
pkgname=polarssl
pkgver=1.2.3
pkgrel=1
pkgdesc="Portable cryptographic and SSL/TLS library"
arch=('i686' 'x86_64')
url="http://www.polarssl.org/"
license=('GPL2')
source=(http://www.polarssl.org/code/releases/polarssl-"$pkgver"-gpl.tgz)
sha1sums=('b47b3db19c4487c5930eaec23dda0dbd24851146')
depends=('glibc')
build() {
cd "$pkgname"-"$pkgver"
sed -i 's^CFLAGS +=^CFLAGS += -fPIC^g' library/Makefile
sed -i 's#all: static#all: static shared#g' library/Makefile
make
make DESTDIR="$pkgdir/usr" install
echo 'WARNING: in order to run the tests, execute in this directory, after you install the library: cd src/polarssl-<version> && make check'
}

View file

@ -1,6 +0,0 @@
2012-01-31 Julien Nicoulaud <julien.nicoulaud@gmail.com>
* 2.4.4-4 :
Add changelog.
Remove unneeded shebang modification.

View file

@ -1,36 +0,0 @@
# Maintainer: Julien Nicoulaud <julien.nicoulaud@gmail.com>
# Contributor: James Rayner <james@archlinux.org>
# Contributor: Todd Maynard <arch@toddmaynard.com>
# Source: https://github.com/nicoulaj/archlinux-packages
plugrel=1
pkgname=python2-cheetah
pkgver=2.4.4
pkgrel=5
pkgdesc="A Python-powered template engine and code generator"
arch=(i686 x86_64)
url="http://www.cheetahtemplate.org"
license=(custom)
depends=(python2 python2-markdown)
makedepends=(python2-distribute)
optdepends=('python2-pygments: for the CodeHighlighter filter')
provides=(cheetah python-cheetah)
conflicts=(cheetah python-cheetah)
changelog=Changelog
source=(http://pypi.python.org/packages/source/C/Cheetah/Cheetah-${pkgver}.tar.gz)
md5sums=('853917116e731afbc8c8a43c37e6ddba')
build() {
cd "${srcdir}/Cheetah-${pkgver}"
python2 setup.py build
}
package() {
msg "Install..."
cd "${srcdir}/Cheetah-${pkgver}"
python2 setup.py install --root="${pkgdir}" || return 1
msg2 "Install copyright resources in /usr/share/licenses/${pkgname}..."
install -Dm644 "${srcdir}/Cheetah-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}

View file

@ -1,6 +1,6 @@
pkgname=sabnzbd
_pkgname=SABnzbd
pkgver=0.7.9
pkgver=0.7.10
pkgrel=1
pkgdesc="A web-interface based binary newsgrabber with NZB file support"
url="http://www.sabnzbd.org"
@ -14,7 +14,7 @@ install="${pkgname}.install"
backup=("etc/conf.d/sabnzbd" "opt/${pkgname}/${pkgname}.ini")
source=("http://downloads.sourceforge.net/sabnzbdplus/${_pkgname}-${pkgver}-src.tar.gz"
"${pkgname}" "${pkgname}.desktop" "addnzb.sh" "nzb-2.png" "sab2_64.png" "x-nzb.xml" "${pkgname}.service" "${pkgname}.confd")
md5sums=('175edddbdcc8b2be51f0987c19bff0ae'
md5sums=('fe5d40de2b3101c53266f2a854c1793d'
'48d60a1c626503c7fef1bc5374390513'
'f9bd5485072714b11f8c30a28024dc4d'
'69b9bcbcf67ff3e7a4cdd9f26e001341'

View file

@ -4,8 +4,8 @@
# Contributor: Augusto Born de Oliveira <augustoborn at gmail dot com>
pkgname=sickbeard-git
pkgver=20121109
pkgrel=2
pkgver=20130126
pkgrel=1
pkgdesc="A PVR application that downloads and manages your TV shows"
arch=(any)
url="http://code.google.com/p/sickbeard/"
@ -18,11 +18,11 @@ install=sickbeard.install
backup=('etc/conf.d/sickbeard')
conflicts=(sickbeard)
source=('sickbeard.init' 'sickbeard.confd' 'sickbeard-system.service' 'sickbeard-user.service' 'sickbeard.tmpfile')
md5sums=('276747cb646524bbee02e1b1c7cd537c'
'b98110609108a554e8349552dc84ea9f'
'a80cd5ff963fd75b5d65a8671b21d831'
'2455963553a4ca61957fc61e509a9d15'
'08bbd75c6cf2ef3e4797d9221f0ce385')
sha256sums=('75430ca55c2d3d6feb4a47822f47fc389db1baaabc3fe1d7084e836193a57697'
'fb54350688c181425c5fcd19a53201026dab1e97f5558f3245f233b516681d89'
'aa2b6496bf622d2b235a47b80d950ba84411e879a08bc656d227e224653aeded'
'bf2f9792d3d7e1d703fec9bf61a1562a34b8d08d1dba3d560e6299ea25bd5a72'
'24f20de2445ff3998aad5d87d94e0fea3b22eb1d0a451ed33ec301ac36a7398d')
_gitroot="git://github.com/midgetspy/Sick-Beard.git"
_gitname="sickbeardpvr"

View file

@ -5,7 +5,7 @@ After=network.target
[Service]
User=sickbeard
Group=sickbeard
ExecStart=/usr/bin/env python2 /opt/sickbeard/SickBeard.py --config /opt/sickbeard/config.ini --datadir /opt/sickbeard
ExecStart=/usr/bin/env python2 /opt/sickbeard/SickBeard.py --quiet --config /opt/sickbeard/config.ini --datadir /opt/sickbeard
[Install]
WantedBy=multi-user.target

View file

@ -2,7 +2,7 @@
Description=SickBeard Daemon
[Service]
ExecStart=/usr/bin/env python2 /opt/sickbeard/SickBeard.py --config %h/.sickbeard/config.ini --datadir %h/.sickbeard
ExecStart=/usr/bin/env python2 /opt/sickbeard/SickBeard.py --quiet --config %h/.sickbeard/config.ini --datadir %h/.sickbeard
[Install]
WantedBy=default.target

View file

@ -23,11 +23,6 @@ post_install() {
chmod 775 /run/sickbeard
fi
echo "You can now run sickbeard as a user service with 'systemctl --user start sickbeard'."
echo "To make this work, first run 'mkdir ~/.sickbeard'. This will run sickbeard as your user."
echo "The system service will run it as the sickbeard user."
echo "If you have a previous install and want to keep the same show database, cache, etc., you can"
echo "run 'cp -r /opt/sickbeard/{Logs,cache,cache.db,config.ini,sickbeard.db} ~/.sickbeard'."
}
## arg 1: the new package version
## arg 2: the old package version
@ -42,11 +37,6 @@ post_upgrade() {
chmod 775 /run/sickbeard
fi
echo "You can now run sickbeard as a user service with 'systemctl --user start sickbeard'."
echo "To make this work, first run 'mkdir ~/.sickbeard'. This will run sickbeard as your user."
echo "The system service will run it as the sickbeard user."
echo "If you have a previous install and want to keep the same show database, cache, etc., you can"
echo "run 'cp -r /opt/sickbeard/{Logs,cache,cache.db,config.ini,sickbeard.db} ~/.sickbeard'."
}
## arg 1: the old package version

View file

@ -1,33 +1,36 @@
# Contributor : xav <xav at ethertricks dot net>
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - use polarssl instead of openssl
# ALARM: Mike Brown <mbrown@archlinuxarm.org>
# - systemd service file addition
pkgname=umurmur
pkgver=0.2.10
pkgrel=2
pkgrel=3
pkgdesc="A minimalistic Mumble server"
arch=('i686' 'x86_64')
url="http://code.google.com/p/umurmur/"
license=('GPL')
depends=('libconfig' 'protobuf-c' 'polarssl')
depends=('libconfig' 'protobuf-c')
source=(http://umurmur.googlecode.com/files/${pkgname}-${pkgver}.tar.gz \
umurmur.rc.d \
umurmur.conf.d \
umurmur.1)
umurmur.1 \
umurmur.service)
sha1sums=('5a53b021078dfbdf001c9af9ff207ea84bcf8222'
'c4f91846a6ee16437452c024652d2f5eca0c0c2a'
'21749181b742154a3be984caa5e29ab62410e9cf'
'07e1f5082faced4610ef97af2aacd52f583b9a5f')
'07e1f5082faced4610ef97af2aacd52f583b9a5f'
'bf8a1fc54b5b68d0db14cdc3d7b76ef8500b1aaf')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
./configure --prefix=/usr --mandir=/usr/share/man --with-ssl=polarssl
./configure --prefix=/usr --mandir=/usr/share/man --with-ssl=openssl
make || return 1
make DESTDIR=${pkgdir} install || return 1
install -Dm644 umurmur.conf.example ${pkgdir}/etc/umurmur/umurmur.conf
install -Dm755 ${srcdir}/umurmur.rc.d ${pkgdir}/etc/rc.d/umurmur
install -Dm644 ${srcdir}/umurmur.conf.d ${pkgdir}/etc/conf.d/umurmur
install -Dm755 ${srcdir}/umurmur.service ${pkgdir}/usr/lib/systemd/system/umurmur.service
}

View file

@ -0,0 +1,12 @@
[Unit]
Description=Mumble Server
After=network.target
[Service]
PIDFile=/run/umurmur.pid
EnvironmentFile=/etc/conf.d/umurmur
ExecStart=/usr/bin/umurmurd $UMURMUR_ARGS
[Install]
WantedBy=multi-user.target

View file

@ -1,8 +1,8 @@
# Contributor tomasgroth at yahoo.dk
# Contributor WarheadsSE <max@warheads.net>
pkgname=xbmc-rbp-git
pkgver=20130121
pkgrel=1
pkgver=20130203
pkgrel=2
buildarch=16
pkgdesc="A software media player and entertainment hub for digital media for the Raspberry Pi"
@ -18,9 +18,14 @@ optdepends=(
'upower: used to trigger suspend functionality'
'unrar: access compressed files without unpacking them'
)
source=(xbmc-ae04d99-321-texturepacker-hostflags-and-rework.patch)
provides=("xbmc")
conflicts=("xbmc")
install="xbmc.install"
source=(xbmc-ae04d99-321-texturepacker-hostflags-and-rework.patch
xbmc.service)
md5sums=('fc6a925a09ba1b13d84daf1121b42ab9')
md5sums=('fc6a925a09ba1b13d84daf1121b42ab9'
'76fae229ebc3bcfaab7e7f27e4fb51f5')
_gitroot="git://github.com/xbmc"
_gitname="xbmc"
@ -92,4 +97,7 @@ package() {
mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}"
done
# systemd stuff
install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
}

View file

@ -0,0 +1,16 @@
post_install() {
[[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
[[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
getent group xbmc > /dev/null || groupadd xbmc
getent passwd xbmc > /dev/null || useradd -m -d /var/lib/xbmc -g xbmc xbmc
usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc
}
post_upgrade() {
post_install $1
}
post_remove() {
post_install $1
echo "You may want to remove xbmc user and group"
}

View file

@ -0,0 +1,13 @@
[Unit]
Description = Starts instance of XBMC using xinit
After = remote-fs.target
[Service]
User = xbmc
Group = xbmc
Type = simple
ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 -nolisten tcp
Restart = always
[Install]
WantedBy = multi-user.target

View file

@ -13,7 +13,7 @@
pkgname=go
pkgver=1.0.3
pkgrel=5
pkgrel=6
epoch=2
pkgdesc='Google Go compiler and tools'
arch=('x86_64' 'i686')

View file

@ -1,13 +1,17 @@
# $Id$
# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
# Maintainer: Sébastien Luttringer
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - removed x86_energy_perf_policy build/package, uses x86 asm
pkgbase=linux-tools
pkgname=('libtraceevent' 'perf' 'cpupower' 'usbip')
pkgver=3.7
pkgrel=4
pkgname=('linux-tools-meta'
'libtraceevent'
'perf'
'cpupower'
'usbip')
pkgver=3.8
pkgrel=1
license=('GPL2')
arch=('i686' 'x86_64')
url='http://www.kernel.org'
@ -23,23 +27,16 @@ makedepends+=('pciutils')
makedepends+=('glib2' 'sysfsutils')
groups=("$pkgbase")
source=("http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$pkgver.tar.xz"
"http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.1.xz"
'cpupower.conf'
'cpupower.rc'
# "http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.6.xz"
'cpupower.default'
'cpupower.systemd'
'cpupower.service'
'usbipd.conf'
'usbipd.rc'
'usbipd.service')
md5sums=('21223369d682bcf44bcdfe1521095983'
'48f5f530b048e387e978e3e49de7742a'
'56883c159381ba89e50ab8ea65efec77'
'5fc1fcda4cef93f16e752b1931db23e3'
'c0d17b5295fe964623c772a2dd981771'
'2450e8ff41b30eb58d43b5fffbfde1f4'
'e8fac9c45a628015644b4150b139278a'
'8a3831d962ff6a9968c0c20fd601cdec'
'a8fb0c6159bee1b9e345a87cabb3ba27')
sha256sums=('e070d1bdfbded5676a4f374721c63565f1c969466c5a3e214004a136b583184b'
'4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e'
'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc'
'8053a6bcd0776a7fefccc5012f93a1710653529e0eab59afcc39f24361c64869')
build() {
# apply stable patching set
@ -82,6 +79,12 @@ build() {
popd
}
package_linux-tools-meta() {
pkgdesc='Linux kernel tools meta package'
groups=()
depends=('libtraceevent' 'perf' 'cpupower' 'usbip')
}
package_libtraceevent() {
pkgdesc='Linux kernel trace event library'
depends=('glibc')
@ -104,14 +107,19 @@ package_perf() {
NO_GTK2=1 \
PERF_VERSION=$pkgver-$pkgrel \
install install-man
# move completion in new directory
cd "$pkgdir"
install -Dm644 usr/etc/bash_completion.d/perf usr/share/bash-completion/perf
rm -r usr/etc
}
package_cpupower() {
pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor'
backup=('etc/conf.d/cpupower')
backup=('etc/default/cpupower')
depends=('bash' 'pciutils')
conflicts=('cpufrequtils')
replaces=('cpufrequtils')
install=cpupower.install
pushd linux-$pkgver/tools/power/cpupower
make \
@ -121,8 +129,7 @@ package_cpupower() {
install install-man
popd
# install startup scripts
install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname"
install -Dm 644 $pkgname.conf "$pkgdir/etc/conf.d/$pkgname"
install -Dm 644 $pkgname.default "$pkgdir/etc/default/$pkgname"
install -Dm 644 $pkgname.service "$pkgdir/usr/lib/systemd/system/$pkgname.service"
install -Dm 755 $pkgname.systemd "$pkgdir/usr/lib/systemd/scripts/$pkgname"
}
@ -138,9 +145,7 @@ package_usbip() {
# module loading
install -Dm 644 /dev/null "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
printf 'usbip-core\nusbip-host\n' > "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
# install daemon scripts
install -Dm 755 usbipd.rc "$pkgdir/etc/rc.d/usbipd"
install -Dm 644 usbipd.conf "$pkgdir/etc/conf.d/usbipd"
# systemd
install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service"
}

View file

@ -0,0 +1,13 @@
#!/bin/sh
# arg 1: the new package version
# arg 2: the old package version
post_upgrade() {
if [ "$(vercmp $2 3.7-4)" -le 0 ]; then
cat << EOF
===> cpupower startup config file moved to /etc/default/cpupower
EOF
fi
}
# vim:set ts=2 sw=2 ft=sh et:

View file

@ -1,16 +0,0 @@
#!/bin/bash
. /etc/rc.conf
. /etc/rc.d/functions
case "$1" in
start|restart)
status 'Setting cpupower rules' /usr/lib/systemd/scripts/cpupower || exit 1
;;
*)
echo "usage: ${0##*/} {start|restart}" >&2
exit 1
;;
esac
# vim:set ts=2 sw=2 ft=sh et:

View file

@ -1,6 +1,6 @@
#!/bin/bash
. /etc/conf.d/cpupower
. /etc/default/cpupower
declare -i fail=0

View file

@ -1,3 +0,0 @@
# vim:set ts=2 sw=2 ft=sh noet:
DAEMON_OPTS=''

View file

@ -1,34 +0,0 @@
#!/bin/bash
. /etc/rc.conf
. /etc/rc.d/functions
. /etc/conf.d/${0##*/}
DAEMON=/usr/sbin/usbipd
PID=$(pidof -o %PPID $DAEMON)
DAEMON_OPTS="--daemon $DAEMON_OPTS"
case "$1" in
start)
stat_busy "Starting ${0##*/} daemon"
[[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon ${0##*/} && stat_done && exit 0
stat_fail
;;
stop)
stat_busy "Stopping ${0##*/} daemon"
[[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0
stat_fail
;;
restart)
$0 stop
$0 start
exit 0
;;
*)
echo "usage: ${0##*/} {start|stop|restart}" >&2
;;
esac
exit 1
# vim:set ts=2 sw=2 ft=sh et:

View file

@ -8,7 +8,7 @@
pkgname=mplayer-vaapi
pkgver=35107
pkgrel=4
pkgrel=5
pkgdesc="A movie player, compiled with vaapi support"
arch=('i686' 'x86_64')
url="http://gitorious.org/vaapi/mplayer"

View file

@ -7,26 +7,26 @@
# - removed --enable-runtime-cpudetection - not supported on ARM
pkgname=mplayer2
pkgver=20121128
pkgrel=2
pkgver=20130126
pkgrel=1
pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer project'
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.mplayer2.org/"
install=$pkgname.install
depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg' 'fontconfig'
'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' 'libcaca' 'libcdio-paranoia' 'libdca' 'libdvdcss'
'libdvdnav' 'libdvdread' 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' 'libvdpau'
'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'lirc-utils' 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu')
depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg'
'fontconfig' 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray'
'libcaca' 'libcdio-paranoia' 'libdca' 'libdvdcss' 'libdvdnav' 'libdvdread'
'libgl' 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' 'libvdpau'
'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'lirc-utils'
'mpg123' 'ncurses' 'sdl' 'ttf-dejavu')
makedepends=('mesa' 'unzip' 'yasm' 'python' 'python-docutils')
backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
provides=('mplayer')
conflicts=('mplayer')
options=(!emptydirs)
source=(ftp://mirrors.kernel.org/archlinux/other/community/$pkgname/$pkgname-$pkgver.tar.xz
cdio-api-fixes.patch)
md5sums=('696adb2503b2202fe39de6c98b573cd6'
'5ff5fa9d0fd50239ed3a1756b31e6a9d')
source=(ftp://mirrors.kernel.org/archlinux/other/community/$pkgname/$pkgname-$pkgver.tar.xz)
sha256sums=('53faf18a1bedb76e980255410b56e59ea4cd5f69984832fc5e942e15dc89622b')
build() {
cd $srcdir/$pkgname-$pkgver
@ -34,8 +34,6 @@ build() {
sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop
find -type f -exec sed -e 's/python3/python/' -i {} \;
patch -Np1 -i $srcdir/cdio-api-fixes.patch
./configure --prefix=/usr --confdir=/etc/mplayer \
--enable-translation --language=all \
--enable-joystick \

View file

@ -1,50 +0,0 @@
diff -upr mplayer2-20121128.orig/stream/stream_cdda.c mplayer2-20121128/stream/stream_cdda.c
--- mplayer2-20121128.orig/stream/stream_cdda.c 2013-01-10 19:37:31.000000000 +0200
+++ mplayer2-20121128/stream/stream_cdda.c 2013-01-10 20:23:25.000000000 +0200
@@ -17,8 +17,8 @@
*/
#include "config.h"
-#include <cdio/cdda.h>
-#include <cdio/paranoia.h>
+#include <cdio/paranoia/cdda.h>
+#include <cdio/paranoia/paranoia.h>
#include <cdio/cdio.h>
#include <stdio.h>
@@ -116,25 +116,25 @@ const m_option_t cdda_opts[] = {
};
static const char *cdtext_name[] = {
- [CDTEXT_ARRANGER] = "Arranger",
- [CDTEXT_COMPOSER] = "Composer",
- [CDTEXT_MESSAGE] = "Message",
- [CDTEXT_ISRC] = "ISRC",
- [CDTEXT_PERFORMER] = "Performer",
- [CDTEXT_SONGWRITER] = "Songwriter",
- [CDTEXT_TITLE] = "Title",
- [CDTEXT_UPC_EAN] = "UPC_EAN",
+ [CDTEXT_FIELD_ARRANGER] = "Arranger",
+ [CDTEXT_FIELD_COMPOSER] = "Composer",
+ [CDTEXT_FIELD_MESSAGE] = "Message",
+ [CDTEXT_FIELD_ISRC] = "ISRC",
+ [CDTEXT_FIELD_PERFORMER] = "Performer",
+ [CDTEXT_FIELD_SONGWRITER] = "Songwriter",
+ [CDTEXT_FIELD_TITLE] = "Title",
+ [CDTEXT_FIELD_UPC_EAN] = "UPC_EAN",
};
static bool print_cdtext(stream_t *s, int track)
{
cdda_priv* p = (cdda_priv*)s->priv;
- cdtext_t *text = cdio_get_cdtext(p->cd->p_cdio, track);
+ cdtext_t *text = cdio_get_cdtext(p->cd->p_cdio);
if (text) {
mp_msg(MSGT_SEEK, MSGL_INFO, "CD-Text (%s):\n", track ? "track" : "CD");
for (int i = 0; i < sizeof(cdtext_name) / sizeof(cdtext_name[0]); i++) {
const char *name = cdtext_name[i];
- const char *value = cdtext_get_const(i, text);
+ const char *value = cdtext_get_const(text, i, track);
if (name && value)
mp_msg(MSGT_SEEK, MSGL_INFO, " %s: '%s'\n", name, value);
}

View file

@ -11,7 +11,7 @@
pkgname=mythtv
pkgver=0.26.0
pkgrel=4
pkgrel=6
epoch=1
pkgdesc="A Homebrew PVR project"
arch=('i686' 'x86_64')
@ -36,23 +36,27 @@ source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
'alsa.patch'
'mythbackend.rc'
'mythbackend.conf'
'mythbackend.service')
'mythbackend.service'
'http://code.mythtv.org/trac/raw-attachment/ticket/11338/libcec-2-support.patch')
md5sums=('f57066bf75e6f14824c494d41639f4f9'
'f64b8219e3d27a2edf96733b851e576b'
'c8f935d42fb8617e9279bd539811ca5f'
'ab962d83614cbd0ac11ce3fcc929829d'
'e4d572dcc307d6d8ae26bee5aebf9f3a')
'e4d572dcc307d6d8ae26bee5aebf9f3a'
'6e156c9fc0b369346d93ccafad46cba3')
build() {
cd "$srcdir/$pkgname-$pkgver"
find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
patch -Np1 -i "$srcdir/alsa.patch"
patch -Np2 -i "$srcdir/libcec-2-support.patch"
sed -re 's@Key, &@Key, @' -i 'bindings/php/MythBase.php'
[[ $CARCH == "arm" ]] && ARCH="armv5te"
[[ $CARCH == "armv7" ]] && ARCH="armv7-a"
[[ $CARCH == "arm" ]] && ARCH="armv5te"
[[ $CARCH == "armv6h" ]] && ARCH="armv6l"
[[ $CARCH == "armv7h" ]] && ARCH="armv7-a"
./configure --prefix=/usr \
--cpu="$ARCH" \
--disable-mmx \

View file

@ -7,19 +7,44 @@
# Contributor: Jason Plum <jplum@archlinuxarm.org>
pkgname=nodejs
pkgver=0.8.18
pkgrel=1
pkgver=0.8.20
pkgrel=2
pkgdesc='Evented I/O for V8 javascript'
arch=('i686' 'x86_64' 'arm')
url='http://nodejs.org/'
license=('MIT')
makedepends=('v8' 'python2')
depends=('python2' 'v8')
makedepends=('python2')
depends=('python2')
checkdepends=('curl') # curl used for check()
optdepends=('openssl: TLS support')
options=('!emptydirs !strip')
source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz")
sha1sums=('e3bc9b64f60f76a32b7d9b35bf86b5d1b8166717')
sha1sums=('b780f58f0e3bc43d2380d4a935f2b45350783b37')
set_flags_for_arm() {
if [ "$CARCH" == "arm" ]; then
# CXXFLAGS is here to bash it over the head. It has a bad habit.
EABI=soft
CXXFLAGS="$CXXFLAGS -march=armv5t -mno-unaligned-access" ;
GYPFLAGS="-Darmeabi=soft -Dv8_can_use_vfp_instructions=false -Dv8_can_use_unaligned_accesses=false -Darmv7=0"
VFP3=off
VFP2=off
fi
if [ "$CARCH" == "armv6h" ]; then
EABI=hard
GYPFLAGS="-Darmeabi=hard -Dv8_use_arm_eabi_hardfloat=true -Dv8_can_use_vfp3_instructions=false -Dv8_can_use_vfp2_instructions=true -Darm7=0 -Darm_vfp=vfp"
VFP3=off
VFP2=on
fi
if [ "$CARCH" == "armv7h" ]; then
EABI=hard
GYPFLAGS="-Darmeabi=hard -Dv8_use_arm_eabi_hardfloat=true -Dv8_can_use_vfp3_instructions=true -Dv8_can_use_vfp2_instructions=true -Darm7=1"
VFP3=on
VFP2=on
fi
export CXXFLAGS
export GYPFLAGS
}
build() {
cd node-v${pkgver}
@ -31,28 +56,7 @@ build() {
export PYTHON=python2
if [ "$CARCH" == "arm" ]; then
# CXXFLAGS is here to bash it over the head. It has a bad habit.
EABI=soft
CXXFLAGS="$CXXFLAGS -march=armv5t -mno-unaligned-access" ;
GYPFLAGS="-Darmeabi=soft -Dv8_can_use_vfp_instructions=false -Dv8_can_use_unaligned_accesses=false -Darmv7=0"
VFP3=off
VFP2=off
fi
if [ "$CARCH" == "armv6h" ]; then
EABI=hard
GYPFLAGS="-Darmeabi=hard -Dv8_use_arm_eabi_hardfloat=true -Dv8_can_use_vfp3_instructions=false -Dv8_can_use_vfp2_instructions=true -Darm7=0 -Darm_vfp=vfp"
VFP3=off
VFP2=on
fi
if [ "$CARCH" == "armv7h" ]; then
EABI=hard
GYPFLAGS="-Darmeabi=hard -Dv8_use_arm_eabi_hardfloat=true -Dv8_can_use_vfp3_instructions=true -Dv8_can_use_vfp2_instructions=true -Darm7=1"
VFP3=on
VFP2=on
fi
export CXXFLAGS
export GYPFLAGS
set_flags_for_arm
# short-cutting python=python2 for GYP, as it will only be used here.
export PYTHON=python2
@ -69,10 +73,10 @@ fi
./configure \
--prefix=/usr \
--without-snapshot \
--with-arm-float-abi=$EABI \
--shared-v8 \
--shared-v8-libpath=/usr/lib \
--shared-v8-includes=/usr/include
--with-arm-float-abi=$EABI
# --shared-v8 \
# --shared-v8-libpath=/usr/lib \
# --shared-v8-includes=/usr/include
# --shared-openssl \
@ -88,6 +92,9 @@ check() {
package() {
cd node-v${pkgver}
# suppress re-compile(with out customized flags) by 'make install'.
set_flags_for_arm
make DESTDIR=${pkgdir} install
# install docs as per user request

View file

@ -4,21 +4,23 @@
# Contributor: WarheadsSE <max@warheads.net>
pkgname=v8
pkgver=3.14.0
pkgrel=1
plugrel=1
pkgdesc='A fast and modern javascript engine'
pkgver=3.16.4.1
pkgrel=2
pkgdesc='Fast and modern javascript engine'
arch=('i686' 'x86_64')
url='http://code.google.com/p/v8'
license=('BSD')
depends=('gcc-libs')
makedepends=('subversion' 'python2')
source=('v8.common.gypi.patch')
md5sums=('8051d31df84530df64752dafad9833b0')
source=('v8.common.gypi.patch'
http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.bz2)
#md5sums=('8051d31df84530df64752dafad9833b0')
sha256sums=('774afb77874c04c5890173f553c6f6da83b3b848e1e6286f2af453163733420a'
'74ab3bc11f6761e5108affcbe15bc673d2ecbe06aa38ea4b27d850321c0fdc2b')
build() {
_source="http://v8.googlecode.com/svn/tags/${pkgver}"
svn checkout "$_source" "${srcdir}/v8-${pkgver}"
# _source="http://v8.googlecode.com/svn/tags/${pkgver}"
# svn checkout "$_source" "${srcdir}/v8-${pkgver}"
cd "${srcdir}/${pkgname}-${pkgver}"
@ -60,6 +62,10 @@ fi
# make arm.release & arm.debug = just arm
make arm.release library=shared snapshot=off vfp3=$VFP3 vfp=$VFP2
# eo build
cd $srcdir && cp -r $pkgname-$pkgver d8-static-$pkgver
cd d8-static-$pkgver
make arm.release library=static snapshot=off vfp3=$VFP3 vfp=$VFP2
}
# seperated to possibly split v8-debug in the future.
@ -74,6 +80,7 @@ package (){
# src/v8-3.11.10/out/arm.release/d8
# src/v8-3.11.10/out/arm.release/lib.target/libv8.so
install -Dm755 out/arm.release/d8 "${pkgdir}/usr/bin/d8"
install -Dm755 $srcdir/d8-static-$pkgver/out/arm.release/d8 $pkgdir/usr/bin/d8-static
install -Dm755 out/arm.release/lib.target/libv8.so "${pkgdir}/usr/lib/libv8.so"
install -d ${pkgdir}/usr/share/licenses/v8

View file

@ -8,16 +8,14 @@
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - --disable-vdpau/xvda, remove from makedepends
# - specify our C/CXXFLAGS in configure
# - patch to remove very wrong XBMC code trying to assert its own ARM CFLAGS, MathUtils.h ARM fix
# - commented TexturePacker install, doesn't appear to want to build
buildarch=4
_prefix=/usr
pkgname=xbmc
pkgver=11.0
pkgrel=14
pkgver=12.0
pkgrel=1
pkgdesc="A software media player and entertainment hub for digital media"
arch=('i686' 'x86_64')
url="http://xbmc.org"
@ -26,9 +24,10 @@ depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff'
'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate'
'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2'
'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos'
'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez' 'glu')
'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez' 'glu'
'tinyxml' 'taglib')
makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libcec'
'udisks' 'upower' 'bluez' 'mesa')
'udisks' 'upower' 'bluez' 'mesa' 'doxygen' 'swig' 'java-environment')
optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
'pulseaudio: pulseaudio support'
'lirc: remote controller support'
@ -39,27 +38,22 @@ optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
install="${pkgname}.install"
source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
"xbmc.service"
"cdio.patch"
"alarm.patch")
sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19'
'82ebca3d66155f889a3d70311b000ac8b911b062af8df308d6a86aecc6b1b52b'
'eef23b30b11acca317f71022df1091e35d8295138680618712f3ef6c719145ca'
'6e4934e8d1bf82890679eca2fa78b3bc5942feedd9c012728a8d04c59be1651d')
"cdio.patch")
md5sums=('a79128b9d094a046947bfd9bb4550809'
'76fae229ebc3bcfaab7e7f27e4fb51f5'
'49c0a7cbfca3666a24e8824950bd371b')
build() {
cd "${srcdir}/xbmc-$pkgver"
# fix retard code
patch -p1 -i "${srcdir}/alarm.patch"
# fix lsb_release dependency
sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp
sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADER:' \
lib/libid3tag/libid3tag/configure.ac \
lib/libdvd/libdvdcss/configure.ac
# sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADER:' \
# lib/libid3tag/libid3tag/configure.ac \
# lib/libdvd/libdvdcss/configure.ac
patch -p1 <$srcdir/cdio.patch
# patch -p1 <$srcdir/cdio.patch
# Bootstrapping XBMC
./bootstrap
@ -118,7 +112,7 @@ package() {
# Tools
install -D -m 0755 "${srcdir}/xbmc-$pkgver/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr"
#install -D -m 0755 "${srcdir}/xbmc-$pkgver/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
install -D -m 0755 "${srcdir}/xbmc-$pkgver/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
# Licenses
install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${pkgname}"

View file

@ -1,135 +0,0 @@
diff -urN a/configure b/configure
--- a/configure 2012-03-24 13:06:47.000000000 -0600
+++ b/configure 2012-06-08 14:37:25.504009179 -0600
@@ -15984,38 +15984,9 @@
LIBS="$LIBS -framework ApplicationServices"
fi
elif test "$use_arch" = "arm"; then
- CFLAGS="$CFLAGS -mfloat-abi=softfp -mno-apcs-stack-check"
- CXXFLAGS="$CXXFLAGS -mfloat-abi=softfp -mno-apcs-stack-check"
- FFMPEG_EXTRACFLAGS="-mfloat-abi=softfp"
- if test "$use_tegra" = "yes"; then
- # Compile for ARMv7a architecture, need to test gcc for vfpv3-d16 support
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="-mfpu=vfpv3-d16"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-int foo;
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- CFLAGS="$SAVE_CFLAGS -Wno-psabi -Wa,-march=armv7a -mtune=cortex-a9 -mfpu=vfpv3-d16 -mthumb-interwork"
- CXXFLAGS="$CXXFLAGS -Wno-psabi -Wa,-march=armv7a -mtune=cortex-a9 -mfpu=vfpv3-d16 -mthumb-interwork"
- FFMPEG_EXTRACFLAGS="$FFMPEG_EXTRACFLAGS -mtune=cortex-a9 -mfpu=vfpv3-d16"
- use_cpu=cortex-a9
-else
- CFLAGS="$SAVE_CFLAGS -Wa,-march=armv6 -mtune=cortex-a8 -mthumb-interwork"
- CXXFLAGS="$CXXFLAGS -Wa,-march=armv6 -mtune=cortex-a8 -mthumb-interwork"
- use_cpu=cortex-a8
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
- # Compile for ARMv7a architecture, CortexA8 cpu and check for enabled NEON coprocessor
- CFLAGS="$CFLAGS -Wa,-march=armv7a -mcpu=cortex-a8"
- CXXFLAGS="$CXXFLAGS -Wa,-march=armv7a -mcpu=cortex-a8"
- if test "$use_neon" = "yes"; then
- CFLAGS="$CFLAGS -mfpu=neon -mvectorize-with-neon-quad"
- CXXFLAGS="$CXXFLAGS -mfpu=neon -mvectorize-with-neon-quad"
- FFMPEG_EXTRACFLAGS="$FFMPEG_EXTRACFLAGS -mfpu=neon"
- fi
- fi
+ CFLAGS="$CFLAGS"
+ CXXFLAGS="$CXXFLAGS"
+ FFMPEG_EXTRACFLAGS=""
fi
# Checks for library functions.
diff -urN a/configure.in b/configure.in
--- a/configure.in 2012-03-21 16:07:50.000000000 -0600
+++ b/configure.in 2012-06-08 14:46:52.687054825 -0600
@@ -572,32 +572,9 @@
LIBS="$LIBS -framework ApplicationServices"
fi
elif test "$use_arch" = "arm"; then
- CFLAGS="$CFLAGS -mfloat-abi=softfp -mno-apcs-stack-check"
- CXXFLAGS="$CXXFLAGS -mfloat-abi=softfp -mno-apcs-stack-check"
- FFMPEG_EXTRACFLAGS="-mfloat-abi=softfp"
- if test "$use_tegra" = "yes"; then
- # Compile for ARMv7a architecture, need to test gcc for vfpv3-d16 support
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="-mfpu=vfpv3-d16"
- AC_COMPILE_IFELSE(
- [AC_LANG_SOURCE([int foo;])],
- [ CFLAGS="$SAVE_CFLAGS -Wno-psabi -Wa,-march=armv7a -mtune=cortex-a9 -mfpu=vfpv3-d16 -mthumb-interwork"
- CXXFLAGS="$CXXFLAGS -Wno-psabi -Wa,-march=armv7a -mtune=cortex-a9 -mfpu=vfpv3-d16 -mthumb-interwork"
- FFMPEG_EXTRACFLAGS="$FFMPEG_EXTRACFLAGS -mtune=cortex-a9 -mfpu=vfpv3-d16"
- use_cpu=cortex-a9],
- [ CFLAGS="$SAVE_CFLAGS -Wa,-march=armv6 -mtune=cortex-a8 -mthumb-interwork"
- CXXFLAGS="$CXXFLAGS -Wa,-march=armv6 -mtune=cortex-a8 -mthumb-interwork"
- use_cpu=cortex-a8])
- else
- # Compile for ARMv7a architecture, CortexA8 cpu and check for enabled NEON coprocessor
- CFLAGS="$CFLAGS -Wa,-march=armv7a -mcpu=cortex-a8"
- CXXFLAGS="$CXXFLAGS -Wa,-march=armv7a -mcpu=cortex-a8"
- if test "$use_neon" = "yes"; then
- CFLAGS="$CFLAGS -mfpu=neon -mvectorize-with-neon-quad"
- CXXFLAGS="$CXXFLAGS -mfpu=neon -mvectorize-with-neon-quad"
- FFMPEG_EXTRACFLAGS="$FFMPEG_EXTRACFLAGS -mfpu=neon"
- fi
- fi
+ CFLAGS="$CFLAGS"
+ CXXFLAGS="$CXXFLAGS"
+ FFMPEG_EXTRACFLAGS=""
fi
# Checks for library functions.
diff -urN a/xbmc/utils/MathUtils.h b/xbmc/utils/MathUtils.h
--- a/xbmc/utils/MathUtils.h 2012-03-21 16:07:50.000000000 -0600
+++ b/xbmc/utils/MathUtils.h 2012-06-08 15:43:59.044891727 -0600
@@ -63,46 +63,8 @@
sar i, 1
}
#else
-#if defined(__powerpc__) || defined(__ppc__)
+#if defined(__powerpc__) || defined(__ppc__) || defined(__arm__)
i = floor(x + round_to_nearest);
-#elif defined(__arm__)
- // From 'ARM®v7-M Architecture Reference Manual' page A7-569:
- // "The floating-point to integer operation (vcvt) [normally] uses the Round towards Zero rounding mode"
- // Because of this...we must use some less-than-straightforward logic to perform this operation without
- // changing the rounding mode flags
-
- /* The assembly below implements the following logic:
- if (x < 0)
- inc = -0.5f
- else
- inc = 0.5f
- int_val = trunc(x+inc);
- err = x - int_val;
- if (err == 0.5f)
- int_val++;
- return int_val;
- */
-
- __asm__ __volatile__ (
- "vmov.F64 d1,%[rnd_val] \n\t" // Copy round_to_nearest into a working register (d1 = 0.5)
- "fcmpezd %P[value] \n\t" // Check value against zero (value == 0?)
- "fmstat \n\t" // Copy the floating-point status flags into the general-purpose status flags
- "it mi \n\t"
- "vnegmi.F64 d1, d1 \n\t" // if N-flag is set, negate round_to_nearest (if (value < 0) d1 = -1 * d1)
- "vadd.F64 d1,%P[value],d1 \n\t" // Add round_to_nearest to value, store result in working register (d1 += value)
- "vcvt.S32.F64 s3,d1 \n\t" // Truncate(round towards zero) (s3 = (int)d1)
- "vmov %[result],s3 \n\t" // Store the integer result in a general-purpose register (result = s3)
- "vcvt.F64.S32 d1,s3 \n\t" // Convert back to floating-point (d1 = (double)s3)
- "vsub.F64 d1,%P[value],d1 \n\t" // Calculate the error (d1 = value - d1)
- "vmov.F64 d2,%[rnd_val] \n\t" // d2 = 0.5;
- "fcmped d1, d2 \n\t" // (d1 == 0.5?)
- "fmstat \n\t" // Copy the floating-point status flags into the general-purpose status flags
- "it eq \n\t"
- "addeq %[result],#1 \n\t" // (if (d1 == d2) result++;)
- : [result] "=r"(i) // Outputs
- : [rnd_val] "Dv" (round_to_nearest), [value] "w"(x) // Inputs
- : "d1", "d2", "s3" // Clobbers
- );
#else
__asm__ __volatile__ (
"fadd %%st\n\t"

View file

@ -6,7 +6,7 @@ After = remote-fs.target
User = xbmc
Group = xbmc
Type = simple
ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0
ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 -nolisten tcp
Restart = always
[Install]

View file

@ -4,17 +4,19 @@
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - modifed os-release
noautobuild=1
pkgname=filesystem
pkgver=2012.12
pkgrel=1
pkgver=2013.01
pkgrel=3
pkgdesc='Base filesystem'
arch=('any')
arch=('i686' 'x86_64')
license=('GPL')
url='http://www.archlinux.org'
groups=('base')
install='filesystem.install'
makedepends=('asciidoc')
depends=('iana-etc' 'bash' 'coreutils' 'nss-myhostname')
depends=('iana-etc')
backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd'
'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf'
'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue')
@ -78,6 +80,11 @@ package() {
install -d -m755 usr/share/man/man${d}
done
#
# add lib symlinks
#
ln -s usr/lib ${pkgdir}/lib
#
# install archlinux(7) manpage
#

View file

@ -1,13 +1,3 @@
post_install() {
[ -f var/log/lastlog ] || : >var/log/lastlog
[ -f var/log/wtmp ] || : >var/log/wtmp
[ -f var/log/btmp ] || { : >var/log/btmp && chmod 600 var/log/btmp; }
# workaround for bug #7194
# readded due to bug #9465
# please do not remove!
chmod 1777 var/spool/mail tmp var/tmp
}
# args: <group> [options]
_addgroup() {
if ! getent group "$1" >/dev/null; then
@ -23,8 +13,6 @@ _adduser() {
}
post_upgrade() {
post_install
_addgroup optical -g 93
_addgroup audio -g 92
_addgroup video -g 91

View file

@ -13,9 +13,9 @@
noautobuild=1
pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc')
pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-go')
pkgver=4.7.2
pkgrel=3
pkgrel=4
#_snapshot=4.7-20120721
pkgdesc="The GNU Compiler Collection"
arch=('i686' 'x86_64')
@ -26,10 +26,10 @@ checkdepends=('dejagnu')
options=('!libtool' '!emptydirs' '!distcc')
source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
#ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
gcc_pure64.patch
gcc-4.7.1-libgo-write.patch
armhf-triplet-trunk.diff)
md5sums=('cc308a0891e778cfda7a151ab8a6e762'
'ced48436c1b3c981d721a829f1094de1'
'5647f5bbbb74fab3013b396da1749d2a'
'bd7330bd41845929f1e0efb3b7d0a060')
if [ -n "${_snapshot}" ]; then
@ -47,12 +47,16 @@ build() {
# Do not run fixincludes
sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
if [ "${CARCH}" = "x86_64" ]; then
patch -p1 -i ${srcdir}/gcc_pure64.patch
fi
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53679
patch -p1 -i ${srcdir}/gcc-4.7.1-libgo-write.patch
echo ${pkgver} > gcc/BASE-VER
# using -pipe causes spurious test-suite failures
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565
CFLAGS=${CFLAGS/-pipe/}
CXXFLAGS=${CXXFLAGS/-pipe/}
# ALARM: Specify build host types, triplet patch
[[ $CARCH == "arm" ]] && CONFIGFLAG="--host=armv5tel-unknown-linux-gnueabi --build=armv5tel-unknown-linux-gnueabi"
[[ $CARCH == "armv6h" ]] && CONFIGFLAG="--host=armv6l-unknown-linux-gnueabihf --build=armv6l-unknown-linux-gnueabihf --with-arch=armv6 --with-float=hard --with-fpu=vfp"
@ -66,7 +70,7 @@ build() {
--libdir=/usr/lib --libexecdir=/usr/lib \
--mandir=/usr/share/man --infodir=/usr/share/info \
--with-bugurl=https://bugs.archlinux.org/ \
--enable-languages=c,c++,fortran,lto,objc,obj-c++ \
--enable-languages=c,c++,fortran,go,lto,objc,obj-c++ \
--enable-shared --enable-threads=posix \
--with-system-zlib --enable-__cxa_atexit \
--disable-libunwind-exceptions --enable-clocale=gnu \
@ -144,17 +148,18 @@ package_gcc()
mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.17-gdb.py
# unfortunately it is much, much easier to install the lot and clean-up the mess...
rm -f $pkgdir/usr/bin/{$CHOST-,}gfortran
rm -f $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo}
rm -f $pkgdir/usr/lib/*.so*
rm -f $pkgdir/usr/lib/lib{ffi,gfortran,objc}.a
rm -f $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc}.a
rm -f $pkgdir/usr/lib/libgfortran.spec
rm -f -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{finclude,include/objc}
rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h}
rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951}
rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,go1}
rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a
rm -f $pkgdir/usr/share/info/{gfortran,libgomp,libitm}.info
rm -f $pkgdir/usr/share/info/{gccgo,gfortran,libgomp,libitm}.info
rm -f -r $pkgdir/usr/lib/go
rm -f $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
rm -f $pkgdir/usr/share/man/man1/gfortran.1
rm -f $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
rm -f $pkgdir/usr/share/man/man3/ffi*
# many packages expect this symlink
@ -238,3 +243,19 @@ package_gcc-objc()
install -Dm644 ${_basedir}/COPYING.RUNTIME \
${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION
}
package_gcc-go()
{
pkgdesc="Go front-end for GCC"
depends=("gcc=$pkgver-$pkgrel")
install=gcc-go.install
cd ${srcdir}/gcc-build
make -j1 DESTDIR=$pkgdir install-target-libgo
make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
# Install Runtime Library Exception
install -Dm644 ${_basedir}/COPYING.RUNTIME \
${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
}

View file

@ -0,0 +1,12 @@
diff -Naur gcc-4.7.1-orig/libgo/runtime/print.c gcc-4.7.1/libgo/runtime/print.c
--- gcc-4.7.1-orig/libgo/runtime/print.c 2012-05-26 04:22:14.000000000 +1000
+++ gcc-4.7.1/libgo/runtime/print.c 2012-06-16 15:06:28.553138502 +1000
@@ -17,7 +17,8 @@
G* g = runtime_g();
if(g == nil || g->writebuf == nil) {
- runtime_write(2, v, n);
+ ssize_t bytesWritten = runtime_write(2, v, n);
+ (void)bytesWritten;
return;
}

20
core/gcc/gcc-go.install Normal file
View file

@ -0,0 +1,20 @@
infodir=usr/share/info
filelist=(gccgo.info)
post_install() {
[ -x usr/bin/install-info ] || return 0
for file in ${filelist[@]}; do
install-info $infodir/$file.gz $infodir/dir 2> /dev/null
done
}
post_upgrade() {
post_install $1
}
pre_remove() {
[ -x usr/bin/install-info ] || return 0
for file in ${filelist[@]}; do
install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
done
}

View file

@ -1,26 +0,0 @@
diff -Naur gcc-orig/gcc/config/i386/linux64.h gcc/gcc/config/i386/linux64.h
--- gcc-orig/gcc/config/i386/linux64.h 2011-07-08 01:38:34.000000000 +1000
+++ gcc/gcc/config/i386/linux64.h 2011-07-24 19:48:05.000000000 +1000
@@ -28,6 +28,6 @@
#define GNU_USER_LINK_EMULATION64 "elf_x86_64"
#define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
diff -Naur gcc-orig/gcc/config/i386/t-linux64 gcc/gcc/config/i386/t-linux64
--- gcc-orig/gcc/config/i386/t-linux64 2011-07-08 01:38:34.000000000 +1000
+++ gcc/gcc/config/i386/t-linux64 2011-07-24 19:49:41.000000000 +1000
@@ -34,8 +34,8 @@
comma=,
MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
-MULTILIB_OSDIRNAMES = m64=../lib64
-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
+MULTILIB_OSDIRNAMES = m64=../lib
+MULTILIB_OSDIRNAMES+= m32=../lib32
MULTILIB_OSDIRNAMES+= mx32=../libx32
LIBGCC = stmp-multilib

View file

@ -5,7 +5,8 @@
# NOTE: valgrind requires rebuilt with each major glibc version
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - Patch glibc for ld-linux-armhf.so.3 and symlink ld-linux.so.3
# - Patch for ld-linux-armhf.so.3 transition and symlink ld-linux.so.3
# - Patch for hard-float ld.so.cache transition
# - Changed configure to enable ports add-on, specify our build host type
# - Disabled distcc
@ -13,26 +14,29 @@ noautobuild=1
pkgname=glibc
pkgver=2.17
pkgrel=1
pkgrel=3
pkgdesc="GNU C Library"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/libc"
license=('GPL' 'LGPL')
groups=('base')
depends=('linux-api-headers>=3.7' 'tzdata')
depends=('linux-api-headers>=3.7' 'tzdata' 'filesystem>=2013.01')
makedepends=('gcc>=4.7')
backup=(etc/gai.conf
etc/locale.gen
etc/nscd.conf)
options=('!strip')
options=('!strip' '!distcc')
install=glibc.install
source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
glibc-2.17-sync-with-linux37.patch
local-soname-hack.diff
fix-hf-ld.so.cache.patch
nscd.service
nscd.tmpfiles
locale.gen.txt
locale-gen)
md5sums=('87bf675c8ee523ebda4803e8e1cec638'
'fb99380d94598cc76d793deebf630022'
'589d79041aa767a5179eaa4e2737dd3f'
'ad8a9af15ab7eeaa23dc7ee85024af9f'
'bccbe5619e75cf1d97312ec3681c605c'
@ -42,8 +46,14 @@ md5sums=('87bf675c8ee523ebda4803e8e1cec638'
build() {
cd ${srcdir}/${pkgname}-${pkgver}
# combination of upstream commits 318cd0b, b540704 and fc1abbe
patch -p1 -i ${srcdir}/glibc-2.17-sync-with-linux37.patch
# ALARM: patch for hard-float ld-linux soname
[[ $CARCH == "armv6h" || $CARCH == "armv7h" ]] && patch -p1 -i ${srcdir}/local-soname-hack.diff
if [[ $CARCH == "armv6h" || $CARCH == "armv7h" ]]; then
patch -p1 -i ${srcdir}/local-soname-hack.diff
patch -p1 -i ${srcdir}/fix-hf-ld.so.cache.patch
fi
cd ${srcdir}
mkdir glibc-build
@ -109,10 +119,7 @@ package() {
rm -f ${pkgdir}/etc/ld.so.{cache,conf}
# eventually this will move to the filesystem package
ln -s usr/lib ${pkgdir}/lib
install -dm755 ${pkgdir}/{etc/rc.d,usr/{sbin,lib/{,locale,systemd/system,tmpfiles.d}}}
install -dm755 ${pkgdir}/usr/lib/{locale,systemd/system,tmpfiles.d}
install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
install -m644 ${srcdir}/nscd.service ${pkgdir}/usr/lib/systemd/system
@ -120,21 +127,18 @@ package() {
install -m644 ${srcdir}/${pkgname}-${pkgver}/posix/gai.conf ${pkgdir}/etc/gai.conf
install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin
install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/bin
# temporary symlink
ln -s ../../sbin/ldconfig ${pkgdir}/usr/bin/ldconfig
# create /etc/locale.gen
install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen
sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
${srcdir}/glibc-${pkgver}/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen
if [[ ${CARCH} = "x86_64" ]]; then
# fix paths and compliance with binary blobs...
sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd
ln -s /lib ${pkgdir}/lib64
fi
# ALARM: symlink ld-linux.so.3 for hard-float
[[ $CARCH == "armv6h" || $CARCH == "armv7h" ]] && ln -s /lib/ld-2.17.so ${pkgdir}/lib/ld-linux.so.3
[[ $CARCH == "armv6h" || $CARCH == "armv7h" ]] && ln -s /lib/ld-${pkgver}.so ${pkgdir}/usr/lib/ld-linux.so.3
# Do not strip the following files for improved debugging support
# ("improved" as in not breaking gdb and valgrind...):
@ -159,3 +163,12 @@ package() {
usr/lib/{libmemusage,libpcprofile,libSegFault}.so \
usr/lib/{pt_chown,{audit,gconv}/*.so}
}
md5sums=('87bf675c8ee523ebda4803e8e1cec638'
'6db4d1661cf34282755dc90330465f6d'
'fb99380d94598cc76d793deebf630022'
'fa192d063312907797eb48f59da99588'
'dee46cbd2e544a61c263a0af39cc934c'
'ad8a9af15ab7eeaa23dc7ee85024af9f'
'bccbe5619e75cf1d97312ec3681c605c'
'07ac979b6ab5eeb778d55f041529d623'
'476e9113489f93b348b21e144b6a8fcf')

View file

@ -0,0 +1,68 @@
diff --git a/elf/cache.c b/elf/cache.c
index 9901952..699550b 100644
--- a/elf/cache.c
+++ b/elf/cache.c
@@ -100,6 +100,10 @@ print_entry (const char *lib, int flag, unsigned int osversion,
case FLAG_AARCH64_LIB64:
fputs (",AArch64", stdout);
break;
+ /* Uses the ARM soft-float ABI. */
+ case FLAG_ARM_LIBSF:
+ fputs (",soft-float", stdout);
+ break;
case 0:
break;
default:
diff --git a/sysdeps/generic/ldconfig.h b/sysdeps/generic/ldconfig.h
index 57a9a46..91190aa 100644
--- a/sysdeps/generic/ldconfig.h
+++ b/sysdeps/generic/ldconfig.h
@@ -36,6 +36,7 @@
#define FLAG_X8664_LIBX32 0x0800
#define FLAG_ARM_LIBHF 0x0900
#define FLAG_AARCH64_LIB64 0x0a00
+#define FLAG_ARM_LIBSF 0x0b00
/* Name of auxiliary cache. */
#define _PATH_LDCONFIG_AUX_CACHE "/var/cache/ldconfig/aux-cache"
diff --git a/ports/sysdeps/unix/sysv/linux/arm/dl-cache.h b/ports/sysdeps/unix/sysv/linux/arm/dl-cache.h
index acc4f28..1221181 100644
--- a/ports/sysdeps/unix/sysv/linux/arm/dl-cache.h
+++ b/ports/sysdeps/unix/sysv/linux/arm/dl-cache.h
@@ -18,12 +18,17 @@
#include <ldconfig.h>
+/* In order to support the transition from unmarked objects
+ to marked objects we must treat unmarked objects as
+ compatible with either FLAG_ARM_LIBHF or FLAG_ARM_LIBSF. */
#ifdef __ARM_PCS_VFP
# define _dl_cache_check_flags(flags) \
- ((flags) == (FLAG_ARM_LIBHF | FLAG_ELF_LIBC6))
+ ((flags) == (FLAG_ARM_LIBHF | FLAG_ELF_LIBC6) \
+ || (flags) == FLAG_ELF_LIBC6)
#else
# define _dl_cache_check_flags(flags) \
- ((flags) == FLAG_ELF_LIBC6)
+ ((flags) == (FLAG_ARM_LIBSF | FLAG_ELF_LIBC6) \
+ || (flags) == FLAG_ELF_LIBC6)
#endif
#include_next <dl-cache.h>
diff --git a/ports/sysdeps/unix/sysv/linux/arm/readelflib.c b/ports/sysdeps/unix/sysv/linux/arm/readelflib.c
index 81e5ccb..0fbd0dc 100644
--- a/ports/sysdeps/unix/sysv/linux/arm/readelflib.c
+++ b/ports/sysdeps/unix/sysv/linux/arm/readelflib.c
@@ -46,6 +46,12 @@ process_elf_file (const char *file_name, const char *lib, int *flag,
if (elf32_header->e_flags & EF_ARM_ABI_FLOAT_HARD)
*flag = FLAG_ARM_LIBHF|FLAG_ELF_LIBC6;
else if (elf32_header->e_flags & EF_ARM_ABI_FLOAT_SOFT)
+ *flag = FLAG_ARM_LIBSF|FLAG_ELF_LIBC6;
+ else
+ /* We must assume the unmarked objects are compatible
+ with all ABI variants. Such objects may have been
+ generated in a transitional period when the ABI
+ tags were not added to all objects. */
*flag = FLAG_ELF_LIBC6;
}
}

View file

@ -0,0 +1,130 @@
diff --git a/sysdeps/gnu/netinet/tcp.h b/sysdeps/gnu/netinet/tcp.h
index 06e8414..b62a696 100644
--- a/sysdeps/gnu/netinet/tcp.h
+++ b/sysdeps/gnu/netinet/tcp.h
@@ -37,20 +37,29 @@
/*
* User-settable options (used with setsockopt).
*/
-#define TCP_NODELAY 1 /* Don't delay send to coalesce packets */
-#define TCP_MAXSEG 2 /* Set maximum segment size */
-#define TCP_CORK 3 /* Control sending of partial frames */
-#define TCP_KEEPIDLE 4 /* Start keeplives after this period */
-#define TCP_KEEPINTVL 5 /* Interval between keepalives */
-#define TCP_KEEPCNT 6 /* Number of keepalives before death */
-#define TCP_SYNCNT 7 /* Number of SYN retransmits */
-#define TCP_LINGER2 8 /* Life time of orphaned FIN-WAIT-2 state */
-#define TCP_DEFER_ACCEPT 9 /* Wake up listener only when data arrive */
-#define TCP_WINDOW_CLAMP 10 /* Bound advertised window */
-#define TCP_INFO 11 /* Information about this connection. */
-#define TCP_QUICKACK 12 /* Bock/reenable quick ACKs. */
-#define TCP_CONGESTION 13 /* Congestion control algorithm. */
-#define TCP_MD5SIG 14 /* TCP MD5 Signature (RFC2385) */
+#define TCP_NODELAY 1 /* Don't delay send to coalesce packets */
+#define TCP_MAXSEG 2 /* Set maximum segment size */
+#define TCP_CORK 3 /* Control sending of partial frames */
+#define TCP_KEEPIDLE 4 /* Start keeplives after this period */
+#define TCP_KEEPINTVL 5 /* Interval between keepalives */
+#define TCP_KEEPCNT 6 /* Number of keepalives before death */
+#define TCP_SYNCNT 7 /* Number of SYN retransmits */
+#define TCP_LINGER2 8 /* Life time of orphaned FIN-WAIT-2 state */
+#define TCP_DEFER_ACCEPT 9 /* Wake up listener only when data arrive */
+#define TCP_WINDOW_CLAMP 10 /* Bound advertised window */
+#define TCP_INFO 11 /* Information about this connection. */
+#define TCP_QUICKACK 12 /* Bock/reenable quick ACKs. */
+#define TCP_CONGESTION 13 /* Congestion control algorithm. */
+#define TCP_MD5SIG 14 /* TCP MD5 Signature (RFC2385) */
+#define TCP_COOKIE_TRANSACTIONS 15 /* TCP Cookie Transactions */
+#define TCP_THIN_LINEAR_TIMEOUTS 16 /* Use linear timeouts for thin streams*/
+#define TCP_THIN_DUPACK 17 /* Fast retrans. after 1 dupack */
+#define TCP_USER_TIMEOUT 18 /* How long for loss retry before timeout */
+#define TCP_REPAIR 19 /* TCP sock is under repair right now */
+#define TCP_REPAIR_QUEUE 20 /* Set TCP queue to repair */
+#define TCP_QUEUE_SEQ 21 /* Set sequence number of repaired queue. */
+#define TCP_REPAIR_OPTIONS 22 /* Repair TCP connection options */
+#define TCP_FASTOPEN 23 /* Enable FastOpen on listeners */
#ifdef __USE_MISC
# include <sys/types.h>
@@ -173,7 +182,9 @@ enum
# define TCPI_OPT_TIMESTAMPS 1
# define TCPI_OPT_SACK 2
# define TCPI_OPT_WSCALE 4
-# define TCPI_OPT_ECN 8
+# define TCPI_OPT_ECN 8 /* ECN was negociated at TCP session init */
+# define TCPI_OPT_ECN_SEEN 16 /* we received at least one packet with ECT */
+# define TCPI_OPT_SYN_DATA 32 /* SYN-ACK acked data in SYN sent or rcvd */
/* Values for tcpi_state. */
enum tcp_ca_state
@@ -241,6 +252,49 @@ struct tcp_md5sig
u_int8_t tcpm_key[TCP_MD5SIG_MAXKEYLEN]; /* Key (binary). */
};
+/* For socket repair options. */
+struct tcp_repair_opt
+{
+ u_int32_t opt_code;
+ u_int32_t opt_val;
+};
+
+/* Queue to repair, for TCP_REPAIR_QUEUE. */
+enum
+{
+ TCP_NO_QUEUE,
+ TCP_RECV_QUEUE,
+ TCP_SEND_QUEUE,
+ TCP_QUEUES_NR,
+};
+
+/* For cookie transactions socket options. */
+#define TCP_COOKIE_MIN 8 /* 64-bits */
+#define TCP_COOKIE_MAX 16 /* 128-bits */
+#define TCP_COOKIE_PAIR_SIZE (2*TCP_COOKIE_MAX)
+
+/* Flags for both getsockopt and setsockopt */
+#define TCP_COOKIE_IN_ALWAYS (1 << 0) /* Discard SYN without cookie */
+#define TCP_COOKIE_OUT_NEVER (1 << 1) /* Prohibit outgoing cookies,
+ * supercedes everything. */
+
+/* Flags for getsockopt */
+#define TCP_S_DATA_IN (1 << 2) /* Was data received? */
+#define TCP_S_DATA_OUT (1 << 3) /* Was data sent? */
+
+#define TCP_MSS_DEFAULT 536U /* IPv4 (RFC1122, RFC2581) */
+#define TCP_MSS_DESIRED 1220U /* IPv6 (tunneled), EDNS0 (RFC3226) */
+
+struct tcp_cookie_transactions
+{
+ u_int16_t tcpct_flags;
+ u_int8_t __tcpct_pad1;
+ u_int8_t tcpct_cookie_desired;
+ u_int16_t tcpct_s_data_desired;
+ u_int16_t tcpct_used;
+ u_int8_t tcpct_value[TCP_MSS_DEFAULT];
+};
+
#endif /* Misc. */
#endif /* netinet/tcp.h */
diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
index df8f167..eadd7d9 100644
--- a/sysdeps/unix/sysv/linux/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/bits/socket.h
@@ -1,6 +1,5 @@
/* System-specific socket constants and types. Linux version.
- Copyright (C) 1991, 1992, 1994-2001, 2004, 2006-2010, 2011, 2012
- Free Software Foundation, Inc.
+ Copyright (C) 1991-2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -208,6 +207,8 @@ enum
#define MSG_MORE MSG_MORE
MSG_WAITFORONE = 0x10000, /* Wait for at least one packet to return.*/
#define MSG_WAITFORONE MSG_WAITFORONE
+ MSG_FASTOPEN = 0x20000000, /* Send data in TCP SYN. */
+#define MSG_FASTOPEN MSG_FASTOPEN
MSG_CMSG_CLOEXEC = 0x40000000 /* Set close_on_exit for file
descriptor received through

View file

@ -3,8 +3,7 @@ filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11})
post_upgrade() {
sbin/ldconfig -r .
[ -x sbin/init ] && sbin/init u
usr/sbin/locale-gen
locale-gen
[ -x usr/bin/install-info ] || return 0
for file in ${filelist[@]}; do

View file

@ -13,7 +13,7 @@ pkgname=('linux-am33x' 'linux-headers-am33x')
_kernelname=${pkgname#linux}
_basekernel=3.2
pkgver=${_basekernel}.32
pkgrel=4
pkgrel=6
arch=('arm')
url="http://www.kernel.org/"
license=('GPL2')
@ -53,6 +53,9 @@ build() {
cat "${srcdir}/config" > ./.config
# accept any new stuff in the kernel
yes "" | make config
# set extraversion to pkgrel
sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
@ -80,7 +83,7 @@ build() {
#return 1
####################
#yes "" | make config
# build!
make ${MAKEFLAGS} uImage modules

View file

@ -0,0 +1,244 @@
# Maintainer: stratum nine <strata@dropswitch.net>
buildarch=4
pkgbase=linux-chromebook
pkgname=('linux-chromebook' 'linux-headers-chromebook')
pkgver=20130219
_kernelname=${pkgname#linux}
_basever=3.4
pkgrel=1
pkgdesc="Chromium OS kernel with ArchLinux ARM tweaks for SAMSUNG ARM Chromebook."
arch=('armv7h')
url="http://git.chromium.org/gitweb/?p=chromiumos/third_party/kernel.git;a=summary"
license=('GPL2')
makedepends=('uboot-mkimage' 'dtc' 'git')
source=('change-default-console-loglevel.patch'
'config.exynos5'
'kernel.its')
md5sums=('b92685a88e9784b3b7c609894ee8b5da'
'd7597be81fabb200501431fc0c05e7db'
'1ee7e0f62516ba3af19022c25636011c')
_gitroot='https://git.chromium.org/git/chromiumos/third_party/kernel.git'
_gitname='chromeos-3.4'
_gitbranch='chromeos-3.4'
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"
cd "$_gitname"
git checkout "$_gitbranch"
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"
# set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
# remove this when a Kconfig knob is made available by upstream
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
# Kernel configuration
cp "${srcdir}/config.exynos5" .config
msg "Get kernel version ..."
make prepare
msg "Building kernel and modules ..."
make uImage modules
msg "Creating .dtb's ..."
make dtbs
msg "Creating FIT image for nv-U-boot ..."
cp "${srcdir}/kernel.its" arch/arm/boot/kernel.its
cd arch/arm/boot
mkimage -f kernel.its zImage
cp -v zImage vmlinux.uimg
}
package_linux-chromebook() {
pkgdesc="The Linux Kernel and modules - SAMSUNG ARM Chromebook kernel and modules"
depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.16')
optdepends=('crda: to set the correct wireless channels of your country')
provides=('linux26' "linux=${pkgver}")
install=${pkgname}.install
cd "${srcdir}/${_gitname}-build"
KARCH=arm
# get kernel version
_kernver="$(make kernelrelease)"
mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
make INSTALL_MOD_PATH="${pkgdir}" modules_install
cp arch/arm/boot/vmlinux.uimg "${pkgdir}/boot/vmlinux.uimg"
# set correct depmod command for install
sed \
-e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \
-e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
-i "${startdir}/${pkgname}.install"
# remove build and source links
rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
# remove the firmware
rm -rf "${pkgdir}/lib/firmware"
# gzip -9 all modules to save 100MB of space
find "${pkgdir}" -name '*.ko' | xargs -P 2 -n 1 gzip -9
# add real version for building modules and running depmod from post_install/upgrade
mkdir -p "${pkgdir}/lib/modules/extramodules-${_basever}"
echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basever}/version"
# Now we call depmod...
depmod -b "$pkgdir" -F System.map "$_kernver"
# move the module tree /lib -> /usr/lib
mkdir -p "${pkgdir}/usr"
mv "$pkgdir/lib" "$pkgdir/usr"
}
package_linux-headers-chromebook() {
pkgdesc="Header files and scripts for building modules for linux kernel - SAMSUNG ARM Chromebook"
provides=("linux-headers=${pkgver}")
conflicts=('linux-headers-omap' 'linux-headers-trimslice')
install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
cd "${pkgdir}/usr/lib/modules/${_kernver}"
ln -sf ../../../src/linux-${_kernver} build
cd "${srcdir}/${_gitname}-build"
install -D -m644 Makefile \
"${pkgdir}/usr/src/linux-${_kernver}/Makefile"
install -D -m644 kernel/Makefile \
"${pkgdir}/usr/src/linux-${_kernver}/kernel/Makefile"
install -D -m644 .config \
"${pkgdir}/usr/src/linux-${_kernver}/.config"
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
for i in acpi asm-generic config crypto drm generated linux math-emu \
media net pcmcia scsi sound trace video xen; do
cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/"
done
# copy arch includes for external modules
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH
cp -a arch/$KARCH/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/
# mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/mach-mx6
# cp -a arch/$KARCH/mach-mx6/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/mach-mx6/
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/plat-samsung
cp -a arch/$KARCH/plat-samsung/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/plat-samsung/
# copy files necessary for later builds, like nvidia and vmware
cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}"
cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}"
# fix permissions on scripts dir
chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts"
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions"
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel"
cp arch/${KARCH}/Makefile "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
if [ "${CARCH}" = "i686" ]; then
cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
fi
cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/"
# add headers for lirc package
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video"
cp drivers/media/video/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/"
for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102; do
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
cp -a drivers/media/video/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
done
# add docbook makefile
install -D -m644 Documentation/DocBook/Makefile \
"${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
# add dm headers
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
cp drivers/md/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
# add inotify.h
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/linux"
cp include/linux/inotify.h "${pkgdir}/usr/src/linux-${_kernver}/include/linux/"
# add wireless headers
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
cp net/mac80211/*.h "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
# add dvb headers for external modules
# in reference to:
# http://bugs.archlinux.org/task/9912
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core"
cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/"
# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
# in reference to:
# http://bugs.archlinux.org/task/13146
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
cp drivers/media/dvb/frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
cp drivers/media/video/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
# add dvb headers
# in reference to:
# http://bugs.archlinux.org/task/20402
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb"
cp drivers/media/dvb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/"
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends"
cp drivers/media/dvb/frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners"
cp drivers/media/common/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/"
# add xfs and shmem for aufs building
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs"
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/mm"
cp fs/xfs/xfs_sb.h "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h"
# copy in Kconfig files
for i in `find . -name "Kconfig*"`; do
mkdir -p "${pkgdir}"/usr/src/linux-${_kernver}/`echo ${i} | sed 's|/Kconfig.*||'`
cp ${i} "${pkgdir}/usr/src/linux-${_kernver}/${i}"
done
chown -R root.root "${pkgdir}/usr/src/linux-${_kernver}"
find "${pkgdir}/usr/src/linux-${_kernver}" -type d -exec chmod 755 {} \;
# strip scripts directory
find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do
case "$(file -bi "${binary}")" in
*application/x-sharedlib*) # Libraries (.so)
/usr/bin/strip ${STRIP_SHARED} "${binary}";;
*application/x-archive*) # Libraries (.a)
/usr/bin/strip ${STRIP_STATIC} "${binary}";;
*application/x-executable*) # Binaries
/usr/bin/strip ${STRIP_BINARIES} "${binary}";;
esac
done
# remove unneeded architectures
rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,x86,xtensa}
}

View file

@ -0,0 +1,12 @@
diff -upr chromeos-3.4.orig/kernel/printk.c chromeos-3.4/kernel/printk.c
--- chromeos-3.4.orig/kernel/printk.c 2013-02-17 20:37:48.018383118 -0500
+++ chromeos-3.4/kernel/printk.c 2013-02-17 20:38:43.679214839 -0500
@@ -62,7 +62,7 @@ void asmlinkage __attribute__((weak)) ea
/* We show everything that is MORE important than this.. */
#define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */
-#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */
+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */
DECLARE_WAIT_QUEUE_HEAD(log_wait);

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,35 @@
/dts-v1/;
/ {
description = "Chrome OS kernel image with one or more FDT blobs";
#address-cells = <1>;
images {
kernel@1{
description = "kernel";
data = /incbin/("zImage");
type = "kernel_noload";
arch = "arm";
os = "linux";
compression = "none";
load = <0>;
entry = <0>;
};
fdt@1{
description = "exynos5250-snow.dtb";
data = /incbin/("exynos5250-snow.dtb");
type = "flat_dt";
arch = "arm";
compression = "none";
hash@1{
algo = "sha1";
};
};
};
configurations {
default = "conf@1";
conf@1{
kernel = "kernel@1";
fdt = "fdt@1";
};
};
};

View file

@ -0,0 +1,36 @@
# arg 1: the new package version
# arg 2: the old package versio
KERNEL_VERSION=3.4.0-ARCH
post_install () {
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
depmod ${KERNEL_VERSION}
sync
echo "NOTE: This kernel will only work on systems with nv-U-boot!"
echo -e "For more details, visit:\n"
echo "http://www.chromium.org/chromium-os/how-tos-and-troubleshooting/using-nv-u-boot-on-the-samsung-arm-chromebook"
# echo "NOTE: You will probably need to copy /boot/uImage to the first partition"
# echo " of your SD card."
}
post_upgrade() {
if grep "^[^#]*[[:space:]]/boot" etc/fstab 2>&1 >/dev/null; then
if ! grep "[[:space:]]/boot" etc/mtab 2>&1 >/dev/null; then
echo "WARNING: /boot appears to be a seperate partition but is not mounted"
echo " This is most likely not what you want. Please mount your /boot"
echo " partition and reinstall the kernel unless you are sure this is OK"
fi
fi
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
depmod ${KERNEL_VERSION}
sync
echo "NOTE: This kernel will only work on systems with nv-U-boot!"
echo -e "For more details, visit:\n"
echo "http://www.chromium.org/chromium-os/how-tos-and-troubleshooting/using-nv-u-boot-on-the-samsung-arm-chromebook"
}

View file

@ -8,7 +8,7 @@ pkgname=('linux-cubox-headless')
_kernelname=${pkgname#linux}
_basekernel=3.5
pkgver=${_basekernel}.7
pkgrel=8
pkgrel=9
cryptover=1.5
arch=('arm')
url="http://www.kernel.org/"

View file

@ -1,5 +1,5 @@
# Maintainer: Kevin Mihelich <kevin@archlinuxarm.org>
# Maintainer: Dave ... <pepdog?@?>
# Maintainer: Dave ... <pepdog@archlinuxarm.org>
buildarch=4
@ -8,7 +8,7 @@ pkgname=('linux-cubox' 'linux-headers-cubox')
_kernelname=${pkgname#linux}
_basekernel=3.5
pkgver=${_basekernel}.7
pkgrel=8
pkgrel=9
cryptover=1.5
arch=('arm')
url="http://www.kernel.org/"

View file

@ -7,10 +7,11 @@ pkgbase=linux-kirkwood
pkgname=('linux-kirkwood' 'linux-headers-kirkwood')
#pkgname=linux-test # Build kernel with a different name
_kernelname=${pkgname#linux}
_basekernel=3.7.3
_basekernel=3.7.8
pkgver=${_basekernel}
pkgrel=0
cryptover=1.5
bfqver=v6
arch=('arm')
url="http://www.kernel.org/"
license=('GPL2')
@ -24,20 +25,19 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2
'change-default-console-loglevel.patch'
'usb-add-reset-resume-quirk-for-several-webcams.patch'
"http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.7.0-v5r1/0001-block-cgroups-kconfig-build-bits-for-BFQ-v5r1-3.7.patch"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.7.0-v5r1/0002-block-introduce-the-BFQ-v5r1-I-O-sched-for-3.7.patch"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-3).0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-$(echo $_basekernel | cut -c 1-3).patch"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-3).0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-$(echo $_basekernel |cut -c 1-3).patch"
'aufs3-3.7.patch.xz')
md5sums=('8fb7330345d0e0e3681e928ab334a942'
md5sums=('053b47e6fe18ea8d23a3716bf64a2cf8'
'17c0496b7f3031c864f49894702b8911'
'f5d3635da03cb45904bedd69b47133de'
'556536312778a6569d2d53de26101d8e'
'1f8103abb9c79b0745926acddec6ec85'
'e828496b341896867da91386cc27df66'
'96fc4f78d37d8f824401b2ca66a5dc0a'
'9d3c56a4b999c8bfbd4018089a62f662'
'd00814b57448895e65fbbc800e8a58ba'
'3a4b8d23c1708283e29477931d63ffb8'
'9daa5f662145f91b25b91b9fbeb874d9'
'c80954ae588d8c168a0b1ae9ffe84c0e'
'fc5936d5966359fcc40e175916e6c65f'
'9d1c42c395ed5a81a79222a808366687'
'961e19a119443158f104a68ea4d0d9f1')
build() {
@ -58,8 +58,8 @@ msg2 "Add AUFS3 patches"
patch -Np1 -i "${srcdir}/aufs3-3.7.patch"
msg2 "Add BFQ patches"
patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-v5r1-3.7.patch"
patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-v5r1-I-O-sched-for-3.7.patch"
patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-$(echo $_basekernel | cut -c 1-3).patch"
patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-$(echo $_basekernel |cut -c 1-3).patch"
# add latest fixes from stable queue, if needed
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git

View file

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 3.7.3-0 Kernel Configuration
# Linux/arm 3.7.6-0 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@ -449,7 +449,9 @@ CONFIG_ATAGS_PROC=y
#
# CPU Power Management
#
# CONFIG_CPU_IDLE is not set
CONFIG_CPU_IDLE=y
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y
# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
#
@ -481,6 +483,7 @@ CONFIG_PM_DEBUG=y
CONFIG_PM_ADVANCED_DEBUG=y
# CONFIG_APM_EMULATION is not set
CONFIG_PM_CLK=y
CONFIG_CPU_PM=y
# CONFIG_ARM_CPU_SUSPEND is not set
CONFIG_NET=y
@ -640,6 +643,7 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
CONFIG_NETFILTER_XT_TARGET_NETMAP=m
CONFIG_NETFILTER_XT_TARGET_NFLOG=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
CONFIG_NETFILTER_XT_TARGET_RATEEST=m
CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
CONFIG_NETFILTER_XT_TARGET_TEE=m

View file

@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-kirkwood
KERNEL_VERSION=3.7.3-0-ARCH
KERNEL_VERSION=3.7.8-0-ARCH
post_install () {
# updating module dependencies

View file

@ -12,7 +12,7 @@
#
# http://www.arm.linux.org.uk/developer/machines/?action=new
#
# Last update: Tue Jan 15 01:20:54 2013
# Last update: Mon Feb 11 23:53:10 2013
#
# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
#
@ -4418,9 +4418,9 @@ epc35 MACH_EPC35 EPC35 4463
smartrtu MACH_SMARTRTU SMARTRTU 4464
rcm101 MACH_RCM101 RCM101 4465
amx_imx53_mxx MACH_AMX_IMX53_MXX AMX_IMX53_MXX 4466
cp3dcg MACH_CP3DCG CP3DCG 4467
cp3dtg MACH_CP3DTG CP3DTG 4468
cp3dug MACH_CP3DUG CP3DUG 4469
crius MACH_CP3DCG CP3DCG 4467
themis MACH_CP3DTG CP3DTG 4468
uranus MACH_CP3DUG CP3DUG 4469
acer_a12 MACH_ACER_A12 ACER_A12 4470
sbc6x MACH_SBC6X SBC6X 4471
u2 MACH_U2 U2 4472
@ -4448,6 +4448,39 @@ colibri_t30 MACH_COLIBRI_T30 COLIBRI_T30 4493
cwv1 MACH_CWV1 CWV1 4494
nsa325 MACH_NSA325 NSA325 4495
dlxp_ul MACH_DLXP_UL DLXP_UL 4496
imx233_dpxmtc MACH_DPXMTC DPXMTC 4497
dpxmtc MACH_DPXMTC DPXMTC 4497
tt_stuttgart MACH_TT_STUTTGART TT_STUTTGART 4498
miranda_apcii MACH_MIRANDA_APCII MIRANDA_APCII 4499
mx6q_moderox MACH_MX6Q_MODEROX MX6Q_MODEROX 4500
mudskipper MACH_MUDSKIPPER MUDSKIPPER 4501
urania MACH_URANIA URANIA 4502
stm_b2112 MACH_STM_B2112 STM_B2112 4503
gtou MACH_GTOU GTOU 4504
mx6q_ats_phoenix MACH_MX6Q_ATS_PHOENIX MX6Q_ATS_PHOENIX 4505
stm_b2116 MACH_STM_B2116 STM_B2116 4506
mythology MACH_MYTHOLOGY MYTHOLOGY 4507
fc360v1 MACH_FC360V1 FC360V1 4508
gps_sensor MACH_GPS_SENSOR GPS_SENSOR 4509
gazelle MACH_GAZELLE GAZELLE 4510
mpq8064_dma MACH_MPQ8064_DMA MPQ8064_DMA 4511
wems_asd01 MACH_WEMS_ASD01 WEMS_ASD01 4512
apalis_t30 MACH_APALIS_T30 APALIS_T30 4513
mx6q_sbc35_c398 MACH_MX6Q_QSBC35_C398 MX6Q_QSBC35_C398 4514
armstonea9 MACH_ARMSTONEA9 ARMSTONEA9 4515
omap_blazetablet MACH_OMAP_BLAZETABLET OMAP_BLAZETABLET 4516
ar6mxq MACH_AR6MXQ AR6MXQ 4517
ar6mxs MACH_AR6MXS AR6MXS 4518
deto_mx6apos MACH_DETO_APOS_MX6 DETO_APOS_MX6 4519
gwventana MACH_GWVENTANA GWVENTANA 4520
igep0033 MACH_IGEP0033 IGEP0033 4521
raca MACH_RACA RACA 4522
applesoda MACH_APPLESODA APPLESODA 4523
h52c1_concerto MACH_H52C1_CONCERTO H52C1_CONCERTO 4524
fcmbrd MACH_FCMBRD FCMBRD 4525
pcaaxs1 MACH_PCAAXS1 PCAAXS1 4526
ls_orca MACH_LS_ORCA LS_ORCA 4527
pcm051lb MACH_PCM051LB PCM051LB 4528
mx6s_lp507_gvci MACH_MX6S_LP507_GVCI MX6S_LP507_GVCI 4529
dido MACH_DIDO DIDO 4530
swarco_itc3_9g20 MACH_SWARCO_ITC3_9G20 SWARCO_ITC3_9G20 4531
robo_roady MACH_ROBO_ROADY ROBO_ROADY 4532

View file

@ -11,15 +11,18 @@ pkgname=('linux-odroid-x2' 'linux-headers-odroid-x2')
# pkgname=linux-custom # Build kernel with a different name
_kernelname=${pkgname#linux}
_basekernel=3.0
pkgver=${_basekernel}.60
pkgver=${_basekernel}.65
pkgrel=1
arch=('armv7h')
url="http://www.kernel.org/"
license=('GPL2')
makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'git')
options=('!strip')
source=('change-default-console-loglevel.patch')
md5sums=('9d3c56a4b999c8bfbd4018089a62f662')
source=('change-default-console-loglevel.patch'
'config')
md5sums=('9d3c56a4b999c8bfbd4018089a62f662'
'9d45fbcf0add6f293213885e329e0bd9')
__gitroot="git://github.com/hardkernel/linux.git"
__gitname="linux"
@ -43,8 +46,7 @@ build() {
# remove this when a Kconfig knob is made available by upstream
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
#Right now, just going to use the default config
# cat "${srcdir}/config" > ./.config
cat "${srcdir}/config" > ./.config
make odroidx2_ubuntu_defconfig
# set extraversion to pkgrel

3053
core/linux-odroid-x2/config Normal file

File diff suppressed because it is too large Load diff

View file

@ -11,8 +11,9 @@ pkgname=('linux-omap' 'linux-headers-omap')
# pkgname=linux-custom # Build kernel with a different name
_kernelname=${pkgname#linux}
_basekernel=3.7
pkgver=${_basekernel}.2
pkgver=${_basekernel}.5
pkgrel=1
rcnrel=x8
arch=('arm')
url="http://www.kernel.org/"
license=('GPL2')
@ -20,14 +21,14 @@ makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage')
options=('!strip')
source=("http://www.kernel.org/pub/linux/kernel/v3.0/linux-${_basekernel}.tar.xz"
"ftp://ftp.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.bz2"
"rcn-ee.diff.gz::http://rcn-ee.net/deb/sid-armhf/v3.7.2-x6/patch-3.7.2-x6.diff.gz"
"http://rcn-ee.net/deb/sid-armhf/v${pkgver}-${rcnrel}/patch-${pkgver}-${rcnrel}.diff.gz"
'config'
'change-default-console-loglevel.patch'
'aufs3-3.7.patch.xz')
md5sums=('21223369d682bcf44bcdfe1521095983'
'b88977838a2a52ff4fb4e82b30726496'
'707424c7aae80f2978785c91e84fb3ed'
'4ea1c224c1cc4a1e0699e8aabf98a0d0'
'0bb3a5b1c5ee7ae694e3db58b2b69a8d'
'57e0c3c53f9c6a412e880a526b6766d4'
'dcec77aa65fda11fab38bcca033bc89a'
'9d3c56a4b999c8bfbd4018089a62f662'
'961e19a119443158f104a68ea4d0d9f1')
@ -45,7 +46,7 @@ build() {
patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
# ALARM patches
patch -Np1 -i "${srcdir}/rcn-ee.diff"
patch -Np1 -i "${srcdir}/patch-${pkgver}-${rcnrel}.diff"
patch -Np1 -F10 -i "${srcdir}/aufs3-3.7.patch"
cat "${srcdir}/config" > ./.config

View file

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 3.7.2 Kernel Configuration
# Linux/arm 3.7.5 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@ -2714,7 +2714,7 @@ CONFIG_DVB_USB_DTT200U=m
CONFIG_DVB_USB_OPERA1=m
CONFIG_DVB_USB_AF9005=m
CONFIG_DVB_USB_AF9005_REMOTE=m
CONFIG_DVB_USB_PCTV452E=m
# CONFIG_DVB_USB_PCTV452E is not set
CONFIG_DVB_USB_DW2102=m
CONFIG_DVB_USB_CINERGY_T2=m
CONFIG_DVB_USB_DTV5100=m
@ -2746,7 +2746,6 @@ CONFIG_VIDEO_EM28XX=m
CONFIG_VIDEO_EM28XX_ALSA=m
CONFIG_VIDEO_EM28XX_DVB=m
CONFIG_VIDEO_EM28XX_RC=m
CONFIG_TTPCI_EEPROM=m
CONFIG_V4L_PLATFORM_DRIVERS=y
# CONFIG_VIDEO_VPFE_CAPTURE is not set
CONFIG_VIDEO_OMAP2_VOUT_VRFB=y
@ -2962,7 +2961,6 @@ CONFIG_DVB_TUNER_DIB0090=m
# SEC control devices for DVB-S
#
CONFIG_DVB_LNBP21=m
CONFIG_DVB_LNBP22=m
CONFIG_DVB_ISL6421=m
CONFIG_DVB_ISL6423=m
CONFIG_DVB_A8293=m
@ -3076,6 +3074,7 @@ CONFIG_LCD_PLATFORM=m
# CONFIG_LCD_AMS369FG06 is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_GENERIC=m
# CONFIG_BACKLIGHT_PWM is not set
# CONFIG_BACKLIGHT_ADP8860 is not set
# CONFIG_BACKLIGHT_ADP8870 is not set
# CONFIG_BACKLIGHT_LM3630 is not set
@ -3165,7 +3164,7 @@ CONFIG_SND_OMAP_SOC_HDMI=y
CONFIG_SND_OMAP_SOC_RX51=y
CONFIG_SND_OMAP_SOC_AM3517EVM=y
CONFIG_SND_OMAP_SOC_SDP3430=y
# CONFIG_SND_OMAP_SOC_OMAP_TWL4030 is not set
CONFIG_SND_OMAP_SOC_OMAP_TWL4030=y
CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=y
CONFIG_SND_OMAP_SOC_OMAP_HDMI=y
CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=y
@ -3466,7 +3465,7 @@ CONFIG_USB_EZUSB_FX2=m
#
# USB Physical Layer drivers
#
# CONFIG_OMAP_USB2 is not set
CONFIG_OMAP_USB2=y
# CONFIG_USB_ISP1301 is not set
CONFIG_USB_ATM=m
CONFIG_USB_SPEEDTOUCH=m
@ -3802,7 +3801,10 @@ CONFIG_RPMSG=m
# CONFIG_EXTCON is not set
# CONFIG_MEMORY is not set
# CONFIG_IIO is not set
# CONFIG_PWM is not set
CONFIG_PWM=y
# CONFIG_PWM_TIECAP is not set
# CONFIG_PWM_TIEHRPWM is not set
CONFIG_PWM_TWL6030=m
#
# CAPEBUS support
@ -3971,10 +3973,6 @@ CONFIG_ROMFS_ON_BLOCK=y
# CONFIG_PSTORE is not set
CONFIG_SYSV_FS=m
# CONFIG_UFS_FS is not set
CONFIG_F2FS_FS=m
CONFIG_F2FS_STAT_FS=y
CONFIG_F2FS_FS_XATTR=y
CONFIG_F2FS_FS_POSIX_ACL=y
CONFIG_AUFS_FS=y
CONFIG_AUFS_BRANCH_MAX_127=y
# CONFIG_AUFS_BRANCH_MAX_511 is not set
@ -3993,6 +3991,10 @@ CONFIG_AUFS_POLL=y
CONFIG_AUFS_BR_HFSPLUS=y
CONFIG_AUFS_BDEV_LOOP=y
# CONFIG_AUFS_DEBUG is not set
CONFIG_F2FS_FS=m
CONFIG_F2FS_STAT_FS=y
CONFIG_F2FS_FS_XATTR=y
CONFIG_F2FS_FS_POSIX_ACL=y
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_NFS_FS=y
CONFIG_NFS_V2=y

View file

@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-omap
KERNEL_VERSION=3.4.4-1-ARCH
KERNEL_VERSION=3.7.4-1-ARCH
post_install () {
# updating module dependencies

View file

@ -9,7 +9,7 @@ pkgname=('linux-raspberrypi' 'linux-headers-raspberrypi')
_kernelname=${pkgname#linux}
_basekernel=3.6
pkgver=${_basekernel}.11
pkgrel=4
pkgrel=7
arch=('arm armv6h')
url="http://www.kernel.org/"
license=('GPL2')
@ -21,10 +21,11 @@ source=('config'
'args-uncompressed.txt'
'boot-uncompressed.txt'
'imagetool-uncompressed.py'
'nxp-pcf8523.patch')
'https://raspy-juice.googlecode.com/svn/trunk/linux-rtc/0001-rtc-pcf8523.patch'
'https://raspy-juice.googlecode.com/svn/trunk/linux-rtc/0002-pcf8523-i2c-register-dt.patch')
build() {
git clone --depth 1 https://github.com/raspberrypi/linux.git
git clone --depth 1 git://github.com/raspberrypi/linux.git
cd "${srcdir}/linux"
@ -33,7 +34,8 @@ build() {
# Add the USB_QUIRK_RESET_RESUME for several webcams
# FS#26528
patch -Np1 -i "${srcdir}/nxp-pcf8523.patch"
patch -Np1 -i "${srcdir}/0001-rtc-pcf8523.patch"
patch -Np1 -i "${srcdir}/0002-pcf8523-i2c-register-dt.patch"
#nxp-pcf8523 RTC patch
patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.patch"
@ -262,11 +264,12 @@ package_linux-headers-raspberrypi() {
rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,x86,xtensa}
}
md5sums=('a36790d26055ecd0478c991a15676ae7'
md5sums=('de885d13a0120f141e879039e12fee86'
'9d3c56a4b999c8bfbd4018089a62f662'
'd00814b57448895e65fbbc800e8a58ba'
'9335d1263fd426215db69841a380ea26'
'a00e424e2fbb8c5a5f77ba2c4871bed4'
'2f82dbe5752af65ff409d737caf11954'
'644b8a8e2729658212d76061dc2062b9')
'ca74031c9e9bfc9f4a668924dcb37f4c'
'1e46f207dcf2dd9392a099a437bb9b3e')

Some files were not shown because too many files have changed in this diff Show more