diff --git a/chroot-buildpackages.sh b/chroot-buildpackages.sh index 4816bdd68a..24d319f4ae 100644 --- a/chroot-buildpackages.sh +++ b/chroot-buildpackages.sh @@ -155,7 +155,7 @@ chroot_build_packages() dpkg -i \${p}_*.deb done fi - mv *.deb /root + mv *.deb /root 2>/dev/null else display_alert "Failed building" "$package_name" "err" fi @@ -284,7 +284,7 @@ chroot_installpackages() aptly -config=$conf -force-replace=true repo add temp $DEST/debs/extra/$RELEASE/ # -gpg-key="128290AF" aptly -secret-keyring="$SRC/lib/extras-buildpkgs/buildpkg.gpg" -batch -config=$conf \ - -component=temp -distribution=$RELEASE publish repo temp + -force-overwrite=true -component=temp -distribution=$RELEASE publish repo temp aptly -config=$conf -listen=":8189" serve & local aptly_pid=$! cp $SRC/lib/extras-buildpkgs/buildpkg.key $CACHEDIR/sdcard/tmp/buildpkg.key diff --git a/extras-buildpkgs/06-libcedrus.conf b/extras-buildpkgs/06-libcedrus.conf index 2138b6f7e7..9d7794b98b 100644 --- a/extras-buildpkgs/06-libcedrus.conf +++ b/extras-buildpkgs/06-libcedrus.conf @@ -1,5 +1,5 @@ # libcedrus -# may depend on libump-dev +# depends on libump local package_name="libcedrus" local package_repo="https://github.com/linux-sunxi/libcedrus.git" local package_ref="branch:master" diff --git a/extras-buildpkgs/90-fswebcam-gc2035.conf b/extras-buildpkgs/90-fswebcam-gc2035.conf new file mode 100644 index 0000000000..9de3376be8 --- /dev/null +++ b/extras-buildpkgs/90-fswebcam-gc2035.conf @@ -0,0 +1,12 @@ +# fswebcam-gc2035 +local package_name="fswebcam-gc2035" +local package_repo="https://github.com/avafinger/fswebcam.git" +local package_ref="branch:master" +local package_builddeps="libgd2-xpm-dev libgd2-noxpm-dev libjpeg-dev libpng-dev libfreetype6-dev" +local package_install_target="fswebcam-gc2035" +local package_arch="armhf" + +package_checkinstall() +{ + false +} diff --git a/extras-buildpkgs/README.md b/extras-buildpkgs/README.md index 5f20630637..fc4363bdfd 100644 --- a/extras-buildpkgs/README.md +++ b/extras-buildpkgs/README.md @@ -49,4 +49,7 @@ KERNEL=="mali", MODE="0660", GROUP="video" * libvdpau-sunxi: select branch (master or dev) -* libcsptr-dev: upgrade to debhelper version 9 +* libcsptr-dev: upgrade to debhelper version 9 - **done** + +## Note +libcedrus compiled without USE_UMP=1 requires access to /dev/ion diff --git a/extras-buildpkgs/fswebcam-gc2035/debian/changelog b/extras-buildpkgs/fswebcam-gc2035/debian/changelog new file mode 100644 index 0000000000..83904b95e2 --- /dev/null +++ b/extras-buildpkgs/fswebcam-gc2035/debian/changelog @@ -0,0 +1,10 @@ +fswebcam-gc2035 (20140113-1) unstable; urgency=low + + * Update debian/watch + * Import Upstream version 20140113 + * Bump Standards-Version to 3.9.5 (no changes needed) + * Move to debhelper 9 + * Import CPPFLAGS during build + * Move packaging to git + + -- Luca Niccoli Tue, 21 Jan 2014 00:02:55 +0100 diff --git a/extras-buildpkgs/fswebcam-gc2035/debian/compat b/extras-buildpkgs/fswebcam-gc2035/debian/compat new file mode 100644 index 0000000000..ec635144f6 --- /dev/null +++ b/extras-buildpkgs/fswebcam-gc2035/debian/compat @@ -0,0 +1 @@ +9 diff --git a/extras-buildpkgs/fswebcam-gc2035/debian/control b/extras-buildpkgs/fswebcam-gc2035/debian/control new file mode 100644 index 0000000000..6106ca91e3 --- /dev/null +++ b/extras-buildpkgs/fswebcam-gc2035/debian/control @@ -0,0 +1,19 @@ +Source: fswebcam-gc2035 +Section: graphics +Priority: optional +Maintainer: Luca Niccoli +Build-Depends: debhelper (>= 9.20120417), libgd2-noxpm-dev | libgd2-xpm-dev, libv4l-dev +Standards-Version: 3.9.5 +Homepage: http://www.firestorm.cx/fswebcam/ +Vcs-Git: git://anonscm.debian.org/collab-maint/fswebcam.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/fswebcam.git;a=summary + +Package: fswebcam-gc2035 +Architecture: linux-any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Tiny and flexible webcam program + Fswebcam is a tiny and flexible webcam command-line program for capturing + images from a V4L1/V4L2 device. It accepts a number of formats, can skip + the first (possibly bad) frames before performing the actual capture, and + can perform simple manipulation on the captured image, such as resizing, + averaging multiple frames or overlaying a caption or an image. diff --git a/extras-buildpkgs/fswebcam-gc2035/debian/copyright b/extras-buildpkgs/fswebcam-gc2035/debian/copyright new file mode 100644 index 0000000000..94ccc4b10e --- /dev/null +++ b/extras-buildpkgs/fswebcam-gc2035/debian/copyright @@ -0,0 +1,62 @@ +This package was debianized by Luca Niccoli on +Wed, 28 Jan 2008 16:05:41 +0100. + +It was downloaded from http://www.firestorm.cx/fswebcam/files/ + +Upstream author: Philip Heron + +Licence (videodev_mjpeg.h): + + videodev_mjpeg.h is a part of mjpegtools, written by + + Rainer Johanni + Gernot Ziegler + Andrew Stevens + Bernhard Praschinger + Ronald Bultje + Xavier Biquard + Matthew Marjanovic + Philipp Zabel + Kawamata/Hitoshi + Stefan Fendt + Scott Moser + Shawn Sulma + Mike Bernson + James Klicman + + mjpegtools is distributed under the terms of the GNU General Public + License, version 2. You may use, modify, and redistribute it under the + terms of this license. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +License (everything else): + + Copyright 2004-2009 Philip Heron + + This program is distributed under the terms of the GNU General Public + License, version 2. You may use, modify, and redistribute it under the + terms of this license. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +The Debian packaging is © 2010, Luca Niccoli and is +licensed under the same license as the upstream source, see above. + +On Debian GNU/Linux systems, the complete text of the GNU General Public +License can be found in `/usr/share/common-licenses/GPL-2' file. + diff --git a/extras-buildpkgs/fswebcam-gc2035/debian/patches/01-Use-kernel-headers.patch b/extras-buildpkgs/fswebcam-gc2035/debian/patches/01-Use-kernel-headers.patch new file mode 100644 index 0000000000..96797a2188 --- /dev/null +++ b/extras-buildpkgs/fswebcam-gc2035/debian/patches/01-Use-kernel-headers.patch @@ -0,0 +1,46 @@ +# Description: Use headers from linux-libc-dev instead of the old included ones. +# Author: Luca Niccoli +# Forwarded: not-needed + +Index: fswebcam-20101118/src_v4l1.c +=================================================================== +--- fswebcam-20101118.orig/src_v4l1.c 2011-06-25 18:10:24.702074598 +0200 ++++ fswebcam-20101118/src_v4l1.c 2011-06-25 18:13:54.387114371 +0200 +@@ -19,7 +19,7 @@ + #include + #include + #include +-#include "videodev.h" ++#include + #include "videodev_mjpeg.h" + #include "src.h" + #include "log.h" +Index: fswebcam-20101118/src_v4l2.c +=================================================================== +--- fswebcam-20101118.orig/src_v4l2.c 2011-06-25 18:10:24.730074738 +0200 ++++ fswebcam-20101118/src_v4l2.c 2011-06-25 18:12:13.794615566 +0200 +@@ -19,7 +19,7 @@ + #include + #include + #include +-#include "videodev2.h" ++#include + #include "src.h" + #include "log.h" + +Index: fswebcam-20101118/videodev_mjpeg.h +=================================================================== +--- fswebcam-20101118.orig/videodev_mjpeg.h 2011-06-25 18:12:20.598649300 +0200 ++++ fswebcam-20101118/videodev_mjpeg.h 2011-06-25 18:14:12.447203924 +0200 +@@ -103,6 +103,11 @@ + /* + Private IOCTL to set up for displaying MJPEG + */ ++ ++#ifndef BASE_VIDIOCPRIVATE ++#define BASE_VIDIOCPRIVATE 192 ++#endif ++ + #define MJPIOC_G_PARAMS _IOR ('v', BASE_VIDIOCPRIVATE+0, struct mjpeg_params) + #define MJPIOC_S_PARAMS _IOWR('v', BASE_VIDIOCPRIVATE+1, struct mjpeg_params) + #define MJPIOC_REQBUFS _IOWR('v', BASE_VIDIOCPRIVATE+2, struct mjpeg_requestbuffers) diff --git a/extras-buildpkgs/fswebcam-gc2035/debian/patches/series b/extras-buildpkgs/fswebcam-gc2035/debian/patches/series new file mode 100644 index 0000000000..c3d8e114ce --- /dev/null +++ b/extras-buildpkgs/fswebcam-gc2035/debian/patches/series @@ -0,0 +1 @@ +01-Use-kernel-headers.patch diff --git a/extras-buildpkgs/fswebcam-gc2035/debian/rules b/extras-buildpkgs/fswebcam-gc2035/debian/rules new file mode 100644 index 0000000000..e1cab5feea --- /dev/null +++ b/extras-buildpkgs/fswebcam-gc2035/debian/rules @@ -0,0 +1,7 @@ +#!/usr/bin/make -f + +override_dh_auto_configure: + dh_auto_configure -- --prefix=/usr --disable-v4l1 --enable-32bit-buffer + +%: + dh $@ diff --git a/extras-buildpkgs/fswebcam-gc2035/debian/source/format b/extras-buildpkgs/fswebcam-gc2035/debian/source/format new file mode 100644 index 0000000000..163aaf8d82 --- /dev/null +++ b/extras-buildpkgs/fswebcam-gc2035/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/extras-buildpkgs/fswebcam-gc2035/debian/watch b/extras-buildpkgs/fswebcam-gc2035/debian/watch new file mode 100644 index 0000000000..51c0f2515e --- /dev/null +++ b/extras-buildpkgs/fswebcam-gc2035/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://www.firestorm.cx/fswebcam/ .*/fswebcam-(\d.*)\.(?:tgz|tbz2|txz|tar\.xz) diff --git a/extras-buildpkgs/libcedrus/debian/rules b/extras-buildpkgs/libcedrus/debian/rules index d6c02b0ad2..9de249b469 100644 --- a/extras-buildpkgs/libcedrus/debian/rules +++ b/extras-buildpkgs/libcedrus/debian/rules @@ -2,6 +2,9 @@ PACKAGE = libcedrus +override_dh_auto_build: + dh_auto_build -- USE_UMP=1 + override_dh_auto_install: dh_auto_install -- prefix=/usr libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) diff --git a/extras-buildpkgs/libcsptr-dev/debian/compat b/extras-buildpkgs/libcsptr-dev/debian/compat index c7930257df..3b0923b7e0 100644 --- a/extras-buildpkgs/libcsptr-dev/debian/compat +++ b/extras-buildpkgs/libcsptr-dev/debian/compat @@ -1 +1 @@ -7 \ No newline at end of file +9 diff --git a/extras-buildpkgs/libcsptr-dev/debian/control b/extras-buildpkgs/libcsptr-dev/debian/control index f07bcc2a6e..409eeb9ca7 100644 --- a/extras-buildpkgs/libcsptr-dev/debian/control +++ b/extras-buildpkgs/libcsptr-dev/debian/control @@ -1,17 +1,15 @@ Source: libcsptr-dev Section: devel Priority: optional -DM-Upload-Allowed: yes Maintainer: Franklin "Snaipe" Mathieu -Build-Depends: debhelper, cmake, -Standards-Version: 3.8.4 +Build-Depends: debhelper (>= 9), cmake +Standards-Version: 3.9.6 Homepage: Franklin "Snaipe" Mathieu Package: libcsptr-dev Architecture: any -Depends: -Recommends: -Suggests: +Depends: + ${misc:Depends}, Description: Smart pointers library for the C programming language. Libcsptr (for "lib-c-smart-pointers") is a library providing smart pointers for the (GNU) C programming language. diff --git a/extras-buildpkgs/libcsptr-dev/debian/rules b/extras-buildpkgs/libcsptr-dev/debian/rules index 91c070ae3e..99e2df1c81 100644 --- a/extras-buildpkgs/libcsptr-dev/debian/rules +++ b/extras-buildpkgs/libcsptr-dev/debian/rules @@ -1,28 +1,9 @@ #!/usr/bin/make -f -BUILDDIR = build_dir +#export DH_VERBOSE=1 -build: - mkdir $(BUILDDIR) - cd $(BUILDDIR); cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr .. - $(MAKE) -C $(BUILDDIR) preinstall - touch build +override_dh_auto_configure: + dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DLIBCSPTR_TESTS=OFF -binary: binary-indep binary-arch - -binary-indep: build - -binary-arch: build - cd $(BUILDDIR); cmake -DCOMPONENT=Unspecified -DCMAKE_INSTALL_PREFIX=../debian/tmp/usr -P cmake_install.cmake - mkdir -p debian/tmp/DEBIAN - dpkg-gensymbols -plibcsptr-dev - dh_shlibdeps - dh_strip - dpkg-gencontrol -plibcsptr-dev - dpkg --build debian/tmp .. - -clean: - rm -f build - rm -rf $(BUILDDIR) - -.PHONY: binary binary-arch binary-indep clean +%: + dh $@ diff --git a/extras-buildpkgs/sunxi-mali-r3p0/debian/control b/extras-buildpkgs/sunxi-mali-r3p0/debian/control index 3016d7e7ed..22f17bc876 100644 --- a/extras-buildpkgs/sunxi-mali-r3p0/debian/control +++ b/extras-buildpkgs/sunxi-mali-r3p0/debian/control @@ -11,9 +11,9 @@ Homepage: https://github.com/linux-sunxi/sunxi-mali/ Package: sunxi-mali-r3p0 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: libegl1-x11, libgles1, libgles2 -Replaces: libegl1-x11, libgles1, libgles2 -Provides: libegl1-x11, libgles1, libgles2 +Replaces: libegl1-mesa, libgles1-mesa, libgles2-mesa +Provides: sunxi-mali +Conflicts: sunxi-mali Description: Mali userspace binary driver version r3p0 This package contains a complete set of Mali userspace drivers, including proprietary OpenGLESv2/EGL binaries. @@ -22,9 +22,9 @@ Package: sunxi-mali-r3p0-dev Section: libdevel Architecture: any Depends: sunxi-mali-r3p0 (= ${binary:Version}), ${misc:Depends} -Conflicts: libegl1-mesa-dev, libgles1-mesa-dev, libgles2-mesa-dev Replaces: libegl1-mesa-dev, libgles1-mesa-dev, libgles2-mesa-dev -Provides: libegl1-mesa-dev, libgles1-mesa-dev, libgles2-mesa-dev +Provides: sunxi-mali-dev +Conflicts: sunxi-mali-dev Description: Mali userspace binary driver version r3p0 This package contains a complete set of Mali userspace drivers, including proprietary OpenGLESv2/EGL binaries.