Merge ssh://parabolagnulinux.org:1863/abslibre

4 files changed, 48 insertions, 62 deletions

diff --git a/libre/ffmpeg-libre/PKGBUILD b/libre/ffmpeg-libre/PKGBUILD
deleted file mode 100644
index 41c332dca..000000000
--- a/libre/ffmpeg-libre/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 85265 2010-07-11 10:15:18Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Paul Mattal <paul@archlinux.org>
-# Maintainer for Parabola GNU/Linux: Omar Botta <omarbotta@gnulinuxlibre.net>
-
-pkgname=ffmpeg-libre
-pkgver=20110330
-pkgrel=1
-pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix. Libre version without faac"
-arch=('i686' 'x86_64')
-url="http://ffmpeg.org/"
-license=('GPL')
-depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg')
-makedepends=('yasm' 'git')
-#git clone git://git.videolan.org/ffmpeg.git
-source=(ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-${pkgver}.tar.xz)
-md5sums=('dd682a876a496b9f9ae8afb3b3b70389')
-#source=(http://ffmpeg.org/releases//releases/ffmpeg-${pkgver}.tar.bz2)
-provides=("ffmpeg=$pkgver")
-conflicts=('ffmpeg')
-replaces=('ffmpeg')
-
-build() {
-  cd "$srcdir/${pkgname%-libre}"
-
-  ./configure \
-    --prefix=/usr \
-    --enable-gpl \
-    --enable-libmp3lame \
-    --enable-libvorbis \
-    --disable-libfaac \
-    --enable-libxvid \
-    --enable-libx264 \
-    --enable-libvpx \
-    --enable-libtheora \
-    --enable-postproc \
-    --enable-shared \
-    --enable-x11grab \
-    --enable-libopencore_amrnb \
-    --enable-libopencore_amrwb \
-    --enable-libschroedinger \
-    --enable-libopenjpeg \
-    --enable-version3 \
-    --disable-nonfree \
-    --enable-runtime-cpudetect \
-    --disable-debug  # libfaac is nonfree
-
-  make
-  make tools/qt-faststart
-  make doc/ff{mpeg,play,server}.1
-
-  make DESTDIR="$pkgdir" install install-man
-  install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index c9a93613f..5b8430f86 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -101,7 +101,7 @@ build() {
         -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
         -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \
         -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" \
-        -e "s|(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*|\1=y|g"
+        -e "s;(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*;\1=y;g" \
         ./.config
   else
     cat "${srcdir}/config.${CARCH}" > ./.config # simpler
@@ -136,6 +136,9 @@ build() {
 
   # build!
   if [ "$CARCH" == "mips64el" ]; then
+    # The build system passes it directly to linker, disable to avoid
+    # having unknown -Wl,... options.
+    export LDFLAGS=""
     # bzImage is arch-specific and not supported on mips; vmlinux is
     # useful for oprofile.
     make ${MAKEFLAGS} vmlinux vmlinuz modules
@@ -226,7 +229,7 @@ package_linux-libre-headers() {
 
 # In case of repackaging this is empty
   if [ -z "${_kernver}" ]; then
-    cd ${srcdir}/linux-$pkgver
+    cd "${srcdir}/linux-${_basekernel}"
     _kernver="$(make kernelrelease)"
   fi
 
@@ -260,7 +263,7 @@ package_linux-libre-headers() {
 
   if [ "$CARCH" = "mips64el" ]; then
     cp "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-    cp "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+    cp -a "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
     cp "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/"
   fi
 
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 62f5d13bc..ea00c881c 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -8,7 +8,7 @@ post_install () {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
-  if [ command -v mkinitcpio 2>&1 > /dev/null ]; then
+  if command -v mkinitcpio 2>&1 > /dev/null; then
     echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
     mkinitcpio -p linux-libre${KERNEL_NAME}
   fi
@@ -52,7 +52,7 @@ post_upgrade() {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
-  if [ command -v mkinitcpio 2>&1 > /dev/null ]; then
+  if command -v mkinitcpio 2>&1 > /dev/null; then
     echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
     mkinitcpio -p linux-libre${KERNEL_NAME}
   fi
diff --git a/social/uci/PKGBUILD b/social/uci/PKGBUILD
new file mode 100644
index 000000000..d306b77bd
--- /dev/null
+++ b/social/uci/PKGBUILD
@@ -0,0 +1,40 @@
+# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
+pkgname=uci
+pkgver=0.8.0
+pkgrel=1
+pkgdesc="OpenWRT's Unified Configuration Interface"
+arch=('i686' 'mips64el')
+url="https://openwrt.org"
+license=('GPL2')
+makedepends=('git' 'cmake' 'lua')
+source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz)
+md5sums=('135bf6c4188b72c7fd7954f592b1e4e4')
+
+# source PKGBUILD; mksource
+mksource() {
+
+  if [ -d uci/.git ]; then
+    pushd uci;  git pull; popd
+  else
+     git clone git://nbd.name/uci.git
+  fi
+
+  cd uci/
+  git archive --prefix=${pkgname}-${pkgver}/ v${pkgver} | \
+    gzip -9 > ../${pkgname}-${pkgver}.tar.gz
+  cd ..
+}
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  cmake .
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir}/ install
+}
+
+# vim:set ts=2 sw=2 et: