summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcommunity/ffmpegsource/PKGBUILD42
-rwxr-xr-xcommunity/ffmpegsource/autoconf.patch22
-rwxr-xr-xcommunity/ffmpegsource/ffmpeg.patch89
-rwxr-xr-xcommunity/higan-gtk/PKGBUILD2
-rwxr-xr-xcommunity/higan-qt/PKGBUILD2
-rw-r--r--community/kphotoalbum/PKGBUILD6
-rw-r--r--community/libmatio/PKGBUILD29
-rw-r--r--extra/easytag/PKGBUILD37
-rw-r--r--extra/easytag/easytag-2.1.7-new_libmp4v2.patch535
-rw-r--r--extra/easytag/easytag-2.1.8-fix_mime_directory_association.patch11
-rw-r--r--extra/easytag/easytag-2.1.8-fix_mixed_declarations_and_code.patch43
-rw-r--r--extra/easytag/easytag.install3
-rw-r--r--extra/ekiga/PKGBUILD10
-rw-r--r--extra/ffmpeg/PKGBUILD11
-rw-r--r--extra/ffmpeg/h264-vdpau.patch26
-rw-r--r--extra/gnome-shell/PKGBUILD17
-rw-r--r--extra/gnome-shell/fs33855.patch65
-rw-r--r--extra/gnome-shell/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch29
-rw-r--r--extra/opal/PKGBUILD14
-rw-r--r--extra/openmpi/PKGBUILD11
-rw-r--r--extra/postfix/PKGBUILD15
-rw-r--r--extra/potrace/PKGBUILD17
-rw-r--r--extra/ptlib/PKGBUILD8
-rw-r--r--libre/blender-libre/PKGBUILD10
-rw-r--r--libre/icecat/PKGBUILD4
-rw-r--r--libre/iceweasel-libre/PKGBUILD9
-rw-r--r--libre/linux-libre-firmware/PKGBUILD6
-rw-r--r--libre/linux-libre-kmod-alx/PKGBUILD14
-rw-r--r--libre/linux-libre-kmod-alx/linux-libre-kmod-alx.install1
-rw-r--r--libre/linux-libre/PKGBUILD30
-rw-r--r--libre/linux-libre/config.i686162
-rw-r--r--libre/linux-libre/config.x86_64162
-rw-r--r--libre/linux-libre/linux-libre.install2
-rw-r--r--libre/lirc-libre/PKGBUILD20
-rw-r--r--libre/lirc-libre/linux-3.8.patch80
-rw-r--r--libre/lirc-libre/lirc.install2
-rw-r--r--libre/luxblend25/PKGBUILD2
-rw-r--r--libre/tp_smapi-libre/PKGBUILD11
-rw-r--r--libre/tp_smapi-libre/tp_smapi.install2
-rw-r--r--libre/vhba-module-libre/PKGBUILD8
-rw-r--r--libre/vhba-module-libre/vhba-module.install2
-rw-r--r--libre/virtualbox-libre-modules/PKGBUILD25
-rw-r--r--libre/virtualbox-libre/003-linux-3.8.patch15
-rw-r--r--libre/virtualbox-libre/PKGBUILD28
-rw-r--r--libre/virtualbox-libre/vboxservice.conf2
-rw-r--r--libre/virtualbox-libre/vboxservice.rc39
-rw-r--r--libre/virtualbox-libre/vboxweb.conf11
-rw-r--r--libre/virtualbox-libre/vboxweb.rc86
-rw-r--r--libre/virtualbox-libre/virtualbox-libre-guest-dkms.install4
-rw-r--r--libre/virtualbox-libre/virtualbox-libre-host-dkms.install4
-rw-r--r--libre/virtualbox-libre/virtualbox-libre.install6
-rw-r--r--pcr/aqsis/PKGBUILD (renamed from artistic/aqsis/PKGBUILD)0
-rw-r--r--pcr/aqsis/aqsis.install (renamed from artistic/aqsis/aqsis.install)0
-rw-r--r--pcr/cinepaint-lts/LICENSE (renamed from artistic/cinepaint-lts/LICENSE)0
-rw-r--r--pcr/cinepaint-lts/PKGBUILD (renamed from artistic/cinepaint-lts/PKGBUILD)0
-rw-r--r--pcr/cinepaint-lts/cinepaint-libpng15.patch (renamed from artistic/cinepaint-lts/cinepaint-libpng15.patch)0
-rw-r--r--pcr/cinepaint-lts/cinepaint.install (renamed from artistic/cinepaint-lts/cinepaint.install)0
-rw-r--r--pcr/gimp-art/PKGBUILD (renamed from artistic/gimp-art/PKGBUILD)0
-rw-r--r--pcr/gimp-art/gimp-splash-artwork.license (renamed from artistic/gimp-art/gimp-splash-artwork.license)0
-rw-r--r--pcr/gimp-art/gimp-splash-artwork.png (renamed from artistic/gimp-art/gimp-splash-artwork.png)bin375245 -> 375245 bytes
-rw-r--r--pcr/gimp-art/gimp.install (renamed from artistic/gimp-art/gimp.install)0
-rw-r--r--pcr/libspnav/Makefile.in.diff (renamed from artistic/libspnav/Makefile.in.diff)0
-rw-r--r--pcr/libspnav/PKGBUILD (renamed from artistic/libspnav/PKGBUILD)0
-rw-r--r--pcr/spacenavd/PKGBUILD (renamed from artistic/spacenavd/PKGBUILD)0
-rw-r--r--pcr/spacenavd/spacenav.service (renamed from artistic/spacenavd/spacenav.service)0
-rw-r--r--pcr/spacenavd/spacenavd (renamed from artistic/spacenavd/spacenavd)0
-rw-r--r--pcr/spnavcfg/PKGBUILD (renamed from artistic/spnavcfg/PKGBUILD)0
-rw-r--r--pcr/yafaray-git/PKGBUILD (renamed from artistic/yafaray-git/PKGBUILD)0
-rw-r--r--pcr/yafaray-git/gcc47.patch (renamed from artistic/yafaray-git/gcc47.patch)0
69 files changed, 787 insertions, 1004 deletions
diff --git a/community/ffmpegsource/PKGBUILD b/community/ffmpegsource/PKGBUILD
new file mode 100755
index 000000000..e68395e82
--- /dev/null
+++ b/community/ffmpegsource/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 84674 2013-02-21 15:31:17Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
+
+pkgname=ffmpegsource
+pkgver=2.17
+pkgrel=9
+pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/ffmpegsource/"
+license=('MIT')
+depends=('ffmpeg')
+options=('!libtool')
+source=("http://ffmpegsource.googlecode.com/files/ffms-${pkgver}-src.tar.bz2" 'autoconf.patch' 'ffmpeg.patch')
+sha256sums=('991f7a77982823afdcf0beb8961deddaf7dd0aea949249e51fbf51cb3314643d'
+ '77e5185f91249b8d032958abb142827a5349b06ff1b4fbd4c5c87ccea811273d'
+ 'adc08b58dec29b04be9d9eb2f12c2fa836565d363aafcfc3e785ae4692db6845')
+
+build() {
+ cd "${srcdir}"/ffms-${pkgver}-src
+
+# Patch
+ patch -Np1 -i "${srcdir}"/autoconf.patch
+ patch -Np1 -i "${srcdir}"/ffmpeg.patch
+ mv configure.in configure.ac
+
+# Build
+ ./autogen.sh --prefix=/usr --enable-shared --disable-static
+ make
+}
+
+package() {
+ cd "${srcdir}"/ffms-${pkgver}-src
+
+# Install
+ make DESTDIR="${pkgdir}" install
+
+# License
+ install -dm 755 "${pkgdir}"/usr/share/licenses/ffmpegsource
+ install -m 644 COPYING "${pkgdir}"/usr/share/licenses/ffmpegsource/LICENSE
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/ffmpegsource/autoconf.patch b/community/ffmpegsource/autoconf.patch
new file mode 100755
index 000000000..0420ad776
--- /dev/null
+++ b/community/ffmpegsource/autoconf.patch
@@ -0,0 +1,22 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,7 +6,7 @@ pkgconfig_DATA = ffms2.pc
+
+ dist_doc_DATA = doc/ffms2-api.html doc/ffms2-changelog.html doc/style.css
+
+-INCLUDES = -I. -I$(top_srcdir)/include -I$(top_srcdir)/src/config @LIBAV_CFLAGS@ @ZLIB_CPPFLAGS@ -include config.h
++AM_CPPFLAGS = -I. -I$(top_srcdir)/include -I$(top_srcdir)/src/config @LIBAV_CFLAGS@ @ZLIB_CPPFLAGS@ -include config.h
+
+ lib_LTLIBRARIES = src/core/libffms2.la
+ src_core_libffms2_la_LIBADD = @LIBAV_LIBS@ @ZLIB_LDFLAGS@ -lz @LTUNDEF@
+--- a/configure.in
++++ b/configure.in
+@@ -30,7 +30,7 @@ if test -z "$CXXFLAGS"; then
+ CXXFLAGS="$OPT_FLAGS"
+ fi
+
+-AM_CONFIG_HEADER([src/config/config.h])
++AC_CONFIG_HEADERS([src/config/config.h])
+ AC_PROG_CC
+ AC_PROG_CXX
+ LT_INIT([static disable-shared])
diff --git a/community/ffmpegsource/ffmpeg.patch b/community/ffmpegsource/ffmpeg.patch
new file mode 100755
index 000000000..71bf6aa2d
--- /dev/null
+++ b/community/ffmpegsource/ffmpeg.patch
@@ -0,0 +1,89 @@
+--- ffms-2.17-src.orig/configure.in
++++ ffms-2.17-src/configure.in
+@@ -135,7 +135,7 @@ AC_DEFUN([TEST_LIBAV],
+ #include <libavcodec/avcodec.h>
+ #include <libswscale/swscale.h>
+ ]],[[
+- avcodec_init();
++ av_register_all();
+ swscale_version();
+ #ifdef FFMS_USE_FFMPEG_COMPAT
+ int bogus = CODEC_ID_G2M;
+--- ffms-2.17-src.orig/include/ffmscompat.h
++++ ffms-2.17-src/include/ffmscompat.h
+@@ -84,6 +84,14 @@
+ # else
+ # define FFMS_CALCULATE_DELAY (CodecContext->has_b_frames + (CodecContext->thread_count - 1))
+ # endif
++# if VERSION_CHECK(LIBAVCODEC_VERSION_INT, <, 54, 25, 0, 54, 51, 100)
++# define FFMS_ID(x) (CODEC_ID_##x)
++# define FFMS_CodecID CodecID
++# else
++# define FFMS_ID(x) (AV_CODEC_ID_##x)
++# define FFMS_CodecID AVCodecID
++# undef CodecID
++# endif
+ #endif
+
+ #ifdef LIBAVUTIL_VERSION_INT
+--- ffms-2.17-src.orig/src/core/codectype.cpp
++++ ffms-2.17-src/src/core/codectype.cpp
+@@ -25,7 +25,7 @@
+
+ typedef struct CodecTags {
+ char str[20];
+- CodecID id;
++ FFMS_CodecID id;
+ } CodecTags;
+
+ static const CodecTags mkv_codec_tags[] = {
+@@ -92,7 +92,7 @@ static const CodecTags mkv_codec_tags[]
+ };
+
+ typedef struct AVCodecTag {
+- enum CodecID id;
++ enum FFMS_CodecID id;
+ unsigned int tag;
+ } AVCodecTag;
+
+@@ -400,7 +400,7 @@ const char *GetLAVCSampleFormatName(AVSa
+ }
+ }
+
+-CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC, unsigned int BitsPerSample) {
++FFMS_CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC, unsigned int BitsPerSample) {
+ /* Look up native codecs */
+ for(int i = 0; mkv_codec_tags[i].id != CODEC_ID_NONE; i++){
+ if(!strncmp(mkv_codec_tags[i].str, Codec,
+@@ -408,7 +408,7 @@ CodecID MatroskaToFFCodecID(char *Codec,
+
+ // Uncompressed and exotic format fixup
+ // This list is incomplete
+- CodecID CID = mkv_codec_tags[i].id;
++ FFMS_CodecID CID = mkv_codec_tags[i].id;
+ switch (CID) {
+ case CODEC_ID_PCM_S16LE:
+ switch (BitsPerSample) {
+--- ffms-2.17-src.orig/src/core/codectype.h
++++ ffms-2.17-src/src/core/codectype.h
+@@ -27,5 +27,5 @@ extern "C" {
+ #include "ffmscompat.h"
+
+ FFMS_TrackType HaaliTrackTypeToFFTrackType(int TT);
+-CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC = 0, unsigned int BitsPerSample = 0);
++FFMS_CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC = 0, unsigned int BitsPerSample = 0);
+ const char *GetLAVCSampleFormatName(AVSampleFormat s);
+--- ffms-2.17-src.orig/src/core/matroskaparser.h
++++ ffms-2.17-src/src/core/matroskaparser.h
+@@ -32,6 +32,11 @@
+ #ifndef MATROSKA_PARSER_H
+ #define MATROSKA_PARSER_H
+
++/* Make sure we undefine CodecID, since libavcodec defines it as AVCodec ID */
++#ifdef CodecID
++#undef CodecID
++#endif
++
+ /* Random notes:
+ *
+ * The parser does not process frame data in any way and does not read it into
diff --git a/community/higan-gtk/PKGBUILD b/community/higan-gtk/PKGBUILD
index de36e0897..a8fd0827f 100755
--- a/community/higan-gtk/PKGBUILD
+++ b/community/higan-gtk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84215 2013-02-13 22:10:29Z alucryd $
+# $Id: PKGBUILD 84670 2013-02-21 13:58:44Z alucryd $
# Maintainer: Maxime Gauduin <alucryd@gmail.com>
pkgname=higan-gtk
diff --git a/community/higan-qt/PKGBUILD b/community/higan-qt/PKGBUILD
index a4632ccb4..0ae875d6f 100755
--- a/community/higan-qt/PKGBUILD
+++ b/community/higan-qt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84214 2013-02-13 22:05:06Z alucryd $
+# $Id: PKGBUILD 84668 2013-02-21 13:55:51Z alucryd $
# Maintainer: Maxime Gauduin <alucryd@gmail.com>
pkgname=higan-qt
diff --git a/community/kphotoalbum/PKGBUILD b/community/kphotoalbum/PKGBUILD
index 1012a35ad..68b047e41 100644
--- a/community/kphotoalbum/PKGBUILD
+++ b/community/kphotoalbum/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 76830 2012-09-30 21:12:00Z lcarlier $
+# $Id: PKGBUILD 84672 2013-02-21 14:40:13Z lcarlier $
# Maintainer: Laurent Carlier <lordheavym@gmail.com>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Gilles CHAUVIN <gcnweb ][ gmail ? com>
@@ -6,7 +6,7 @@
# Contributor: chfoxli <lg ][ romandie ? com>
pkgname=kphotoalbum
-pkgver=4.3
+pkgver=4.4
pkgrel=1
pkgdesc="KDE Photo Album, picture collection manager"
url="http://www.kphotoalbum.org/"
@@ -19,7 +19,7 @@ optdepends=('kdeedu-marble: integration with Marble'
'kdemultimedia-mplayerthumbs: video thumbnails')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('09b5ba7d44ee7426802b233454927b8f')
+md5sums=('84cc7741c8e8c62e097ebb5e81d40979')
build() {
cd ${srcdir}
diff --git a/community/libmatio/PKGBUILD b/community/libmatio/PKGBUILD
new file mode 100644
index 000000000..7bc220d2c
--- /dev/null
+++ b/community/libmatio/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 84665 2013-02-21 12:00:20Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
+# Contributor: William Rea <sillywilly@gmail.com>
+
+pkgname=libmatio
+pkgver=1.5.0
+pkgrel=2
+pkgdesc='C library with a fortran 90/95 module interface for reading/writing MATLAB MAT-files'
+arch=('x86_64' 'i686')
+license=('LGPL')
+url='http://sourceforge.net/projects/matio'
+depends=('zlib')
+options=('!libtool' '!emptydirs')
+source=("http://downloads.sourceforge.net/matio/matio-$pkgver.tar.gz")
+sha256sums=('550dfa642c4ca7ad5ce5a0249264436ced14c72c116aee9fd14e99c7bd8cc72e')
+
+build() {
+ cd "$srcdir/matio-$pkgver"
+ ./configure --prefix=/usr --enable-shared
+ make
+}
+
+package() {
+ cd "$srcdir/matio-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/easytag/PKGBUILD b/extra/easytag/PKGBUILD
index 430469d5e..bef1e4ae1 100644
--- a/extra/easytag/PKGBUILD
+++ b/extra/easytag/PKGBUILD
@@ -1,29 +1,46 @@
-# $Id: PKGBUILD 171355 2012-11-17 09:20:41Z eric $
-# Maintainer:
+# $Id: PKGBUILD 178421 2013-02-21 20:49:20Z guillaume $
+# Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
# Contributor: Kevin Piche <kevin@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
pkgname=easytag
-pkgver=2.1.7
-pkgrel=3.1
-pkgdesc="Utility for viewing, editing and writing ID3 tags of your MP3 files"
+pkgver=2.1.8
+pkgrel=2
+pkgdesc='Utility for viewing and editing tags for most audio formats'
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url='http://easytag.sourceforge.net/'
-depends=('id3lib' 'libid3tag' 'gtk2' 'libvorbis' 'flac' 'speex' 'wavpack' 'libmp4v2' 'desktop-file-utils')
+makedepends=('intltool')
+depends=('id3lib' 'libid3tag' 'gtk2' 'libvorbis' 'flac' 'speex' 'wavpack' 'taglib'
+ 'desktop-file-utils' 'hicolor-icon-theme')
install=${pkgname}.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" easytag-2.1.7-new_libmp4v2.patch)
-md5sums=('9df3e800d80e754670642f2ba5e03539'
- '0d01887de463585d944777b638a28c85')
+source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz
+ easytag-2.1.8-fix_mixed_declarations_and_code.patch
+ easytag-2.1.8-fix_mime_directory_association.patch)
+sha256sums=('1a2f75c9a70aeb7a404dfaa96e0df0eaaa325df301c58f0f708d0da4c08e65a9'
+ '453d2a102cf482d6d1586b11e531bf267f302aab3ee6b8c43b6bcc61cfa2ede5'
+ '693da67f0c96d51ad363bb9e70a22b402bc7c5058d648981919a115381700cd3')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p0 -i "${srcdir}/easytag-2.1.7-new_libmp4v2.patch"
+
+ # Already fixed upstream
+ # http://git.gnome.org/browse/easytag/commit/src/wavpack_tag.c?id=17a33964c32035f6b9986e13726ae3582a126244
+ patch -p0 -i ${srcdir}/easytag-2.1.8-fix_mixed_declarations_and_code.patch
+
+ # Bad Easytag! Bad! You don't know your place!
+ patch -p0 -i ${srcdir}/easytag-2.1.8-fix_mime_directory_association.patch
+
./configure --prefix=/usr
make
}
+check() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make -k check
+}
+
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
diff --git a/extra/easytag/easytag-2.1.7-new_libmp4v2.patch b/extra/easytag/easytag-2.1.7-new_libmp4v2.patch
deleted file mode 100644
index 4a6c315c2..000000000
--- a/extra/easytag/easytag-2.1.7-new_libmp4v2.patch
+++ /dev/null
@@ -1,535 +0,0 @@
-Compability with libmp4v2.so.2 (upstream revision r479)
-
-http://bugs.gentoo.org/409281
-
---- src/mp4_header.c
-+++ src/mp4_header.c
-@@ -204,7 +204,7 @@
- /* Get size of file */
- ETFileInfo->size = Get_File_Size(filename);
-
-- if ((file = MP4Read(filename, 0)) == MP4_INVALID_FILE_HANDLE )
-+ if ((file = MP4Read(filename)) == MP4_INVALID_FILE_HANDLE )
- {
- gchar *filename_utf8 = filename_to_display(filename);
- //g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-@@ -218,7 +218,7 @@
- {
- gchar *filename_utf8 = filename_to_display(filename);
- Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,("Contains no audio track"));
-- MP4Close(file);
-+ MP4Close(file, 0);
- g_free(filename_utf8);
- return FALSE;
- }
-@@ -243,7 +243,7 @@
- ETFileInfo->mode = MP4GetTrackAudioChannels(file, trackId);
- ETFileInfo->duration = MP4ConvertFromTrackDuration(file, trackId, MP4GetTrackDuration(file, trackId), MP4_SECS_TIME_SCALE);
-
-- MP4Close(file);
-+ MP4Close(file, 0);
- return TRUE;
- }
-
---- src/mp4_tag.c
-+++ src/mp4_tag.c
-@@ -80,15 +80,9 @@
- {
- FILE *file;
- MP4FileHandle mp4file = NULL;
-- uint16_t track, track_total;
-- uint16_t disk, disktotal;
-- u_int8_t *coverArt;
-- u_int32_t coverSize;
- Picture *prev_pic = NULL;
--#ifdef NEWMP4
- gint pic_num;
--#endif
--
-+
- if (!filename || !FileTag)
- return FALSE;
-
-@@ -102,7 +96,7 @@
- fclose(file); // We close it cause mp4 opens/closes file itself
-
- /* Get data from tag */
-- mp4file = MP4Read(filename, 0);
-+ mp4file = MP4Read(filename);
- if (mp4file == MP4_INVALID_FILE_HANDLE)
- {
- gchar *filename_utf8 = filename_to_display(filename);
-@@ -111,109 +105,134 @@
- return FALSE;
- }
-
-+ const MP4Tags* tags = MP4TagsAlloc();
-+ MP4TagsFetch(tags, mp4file);
-+
- /* TODO Add error detection */
-
- /*********
- * Title *
- *********/
-- MP4GetMetadataName(mp4file, &FileTag->title);
-+ if (tags->name)
-+ {
-+ FileTag->title = Try_To_Validate_Utf8_String(tags->name);
-+ }
-
- /**********
- * Artist *
- **********/
-- MP4GetMetadataArtist(mp4file, &FileTag->artist);
-+ if (tags->artist)
-+ {
-+ FileTag->artist = Try_To_Validate_Utf8_String(tags->artist);
-+ }
-+
-+ /****************
-+ * Album Artist *
-+ ****************/
-+ if (tags->albumArtist)
-+ {
-+ FileTag->album_artist = Try_To_Validate_Utf8_String(tags->albumArtist);
-+ }
-
- /*********
- * Album *
- *********/
-- MP4GetMetadataAlbum(mp4file, &FileTag->album);
-+ if (tags->album)
-+ {
-+ FileTag->album = Try_To_Validate_Utf8_String(tags->album);
-+ }
-
- /**********************
- * Disk / Total Disks *
- **********************/
-- if (MP4GetMetadataDisk(mp4file, &disk, &disktotal))
-+ if (tags->disk)
- {
-- if (disk != 0 && disktotal != 0)
-- FileTag->disc_number = g_strdup_printf("%d/%d",(gint)disk,(gint)disktotal);
-- else if (disk != 0)
-- FileTag->disc_number = g_strdup_printf("%d",(gint)disk);
-- else if (disktotal != 0)
-- FileTag->disc_number = g_strdup_printf("/%d",(gint)disktotal);
-- //if (disktotal != 0)
-- // FileTag->disk_number_total = g_strdup_printf("%d",(gint)disktotal);
-+ if (tags->disk->index != 0 && tags->disk->total != 0)
-+ FileTag->disc_number = g_strdup_printf("%d/%d",(gint)tags->disk->index,(gint)tags->disk->total);
-+ else if (tags->disk->index != 0)
-+ FileTag->disc_number = g_strdup_printf("%d",(gint)tags->disk->index);
-+ else if (tags->disk->total != 0)
-+ FileTag->disc_number = g_strdup_printf("/%d",(gint)tags->disk->total);
- }
-
- /********
- * Year *
- ********/
-- MP4GetMetadataYear(mp4file, &FileTag->year);
-+ if (tags->releaseDate)
-+ {
-+ FileTag->year = Try_To_Validate_Utf8_String(tags->releaseDate);
-+ }
-
- /*************************
- * Track and Total Track *
- *************************/
-- if (MP4GetMetadataTrack(mp4file, &track, &track_total))
-+ if (tags->track)
- {
-- if (track != 0)
-- FileTag->track = g_strdup_printf("%.*d",NUMBER_TRACK_FORMATED_SPIN_BUTTON,(gint)track); // Just to have numbers like this : '01', '05', '12', ...
-- if (track_total != 0)
-- FileTag->track_total = g_strdup_printf("%.*d",NUMBER_TRACK_FORMATED_SPIN_BUTTON,(gint)track_total); // Just to have numbers like this : '01', '05', '12', ...
-+ if (tags->track->index != 0)
-+ FileTag->track = g_strdup_printf("%.*d",NUMBER_TRACK_FORMATED_SPIN_BUTTON,(gint)tags->track->index); // Just to have numbers like this : '01', '05', '12', ...
-+ if (tags->track->total != 0)
-+ FileTag->track_total = g_strdup_printf("%.*d",NUMBER_TRACK_FORMATED_SPIN_BUTTON,(gint)tags->track->total); // Just to have numbers like this : '01', '05', '12', ...
- }
-
- /*********
- * Genre *
- *********/
-- MP4GetMetadataGenre(mp4file, &FileTag->genre);
-+ if (tags->genre)
-+ {
-+ FileTag->genre = Try_To_Validate_Utf8_String(tags->genre);
-+ }
-
- /***********
- * Comment *
- ***********/
-- MP4GetMetadataComment(mp4file, &FileTag->comment);
-+ if (tags->comments)
-+ {
-+ FileTag->comment = Try_To_Validate_Utf8_String(tags->comments);
-+ }
-
- /**********************
- * Composer or Writer *
- **********************/
-- MP4GetMetadataWriter(mp4file, &FileTag->composer);
-+ if (tags->composer)
-+ {
-+ FileTag->composer = Try_To_Validate_Utf8_String(tags->composer);
-+ }
-
- /*****************
- * Encoding Tool *
- *****************/
-- MP4GetMetadataTool(mp4file, &FileTag->encoded_by);
--
-- /* Unimplemented
-- Tempo / BPM
-- MP4GetMetadataTempo(file, &string)
-- */
-+ if (tags->encodedBy)
-+ {
-+ FileTag->encoded_by = Try_To_Validate_Utf8_String(tags->encodedBy);
-+ }
-
- /***********
- * Picture *
- ***********/
--#ifdef NEWMP4
-- // There version can handle multiple pictures!
-- // Version 1.6 of libmp4v2 introduces an index argument for MP4GetMetadataCoverart
-- for (pic_num = 0; (MP4GetMetadataCoverArt( mp4file, &coverArt, &coverSize,pic_num )); pic_num++)
--#else
-- // There version handle only one picture!
-- if ( MP4GetMetadataCoverArt( mp4file, &coverArt, &coverSize ) )
--#endif
-- {
-- Picture *pic;
--
-- pic = Picture_Allocate();
-- if (!prev_pic)
-- FileTag->picture = pic;
-- else
-- prev_pic->next = pic;
-- prev_pic = pic;
--
-- pic->size = coverSize;
-- pic->data = coverArt;
-- pic->type = PICTURE_TYPE_FRONT_COVER;
-- pic->description = NULL;
-+ if (tags->artworkCount) {
-+ const MP4TagArtwork* art = tags->artwork; /* artwork != NULL when artworkCount > 0 */
-+ for (pic_num = 0; pic_num < tags->artworkCount; pic_num++, art++)
-+ {
-+ Picture *pic;
-+
-+ pic = Picture_Allocate();
-+ if (!prev_pic)
-+ FileTag->picture = pic;
-+ else
-+ prev_pic->next = pic;
-+ prev_pic = pic;
-+
-+ pic->size = art->size;
-+ pic->data = g_memdup(art->data, pic->size);
-+ pic->type = PICTURE_TYPE_FRONT_COVER;
-+ pic->description = NULL;
-+ }
- }
-
-
- /* Free allocated data */
-- MP4Close(mp4file);
-+ MP4TagsFree(tags);
-+ MP4Close(mp4file, 0);
-
- return TRUE;
- }
-@@ -235,6 +254,7 @@
- FILE *file;
- MP4FileHandle mp4file = NULL;
- gint error = 0;
-+ gint pic_num;
-
- if (!ETFile || !ETFile->FileTag)
- return FALSE;
-@@ -252,23 +272,25 @@
- fclose(file);
-
- /* Open file for writing */
-- mp4file = MP4Modify(filename,0,0);
-+ mp4file = MP4Modify(filename, 0);
- if (mp4file == MP4_INVALID_FILE_HANDLE)
- {
- Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,_("MP4 format invalid"));
- return FALSE;
- }
-
-+ const MP4Tags* tags = MP4TagsAlloc();
-+ MP4TagsFetch(tags, mp4file);
-+
- /*********
- * Title *
- *********/
- if (FileTag->title && g_utf8_strlen(FileTag->title, -1) > 0)
- {
-- MP4SetMetadataName(mp4file, FileTag->title);
-+ MP4TagsSetName(tags, FileTag->title);
- }else
- {
-- //MP4DeleteMetadataName(mp4file); // Not available on mpeg4ip-1.2 (only in 1.3)
-- MP4SetMetadataName(mp4file, "");
-+ MP4TagsSetName(tags, "");
- }
-
- /**********
-@@ -276,11 +298,21 @@
- **********/
- if (FileTag->artist && g_utf8_strlen(FileTag->artist, -1) > 0)
- {
-- MP4SetMetadataArtist(mp4file, FileTag->artist);
-+ MP4TagsSetArtist(tags, FileTag->artist);
-+ }else
-+ {
-+ MP4TagsSetArtist(tags, "");
-+ }
-+
-+ /****************
-+ * Album Artist *
-+ ****************/
-+ if (FileTag->artist && g_utf8_strlen(FileTag->artist, -1) > 0)
-+ {
-+ MP4TagsSetAlbumArtist(tags, FileTag->album_artist);
- }else
- {
-- //MP4DeleteMetadataArtist(mp4file);
-- MP4SetMetadataArtist(mp4file, "");
-+ MP4TagsSetAlbumArtist(tags, "");
- }
-
- /*********
-@@ -288,22 +320,19 @@
- *********/
- if (FileTag->album && g_utf8_strlen(FileTag->album, -1) > 0)
- {
-- MP4SetMetadataAlbum(mp4file, FileTag->album);
-+ MP4TagsSetAlbum(tags, FileTag->album);
- }else
- {
-- //MP4DeleteMetadataAlbum(mp4file);
-- MP4SetMetadataAlbum(mp4file, "");
-+ MP4TagsSetAlbum(tags, "");
- }
-
- /**********************
- * Disk / Total Disks *
- **********************/
-+ MP4TagDisk td;
- if (FileTag->disc_number && g_utf8_strlen(FileTag->disc_number, -1) > 0)
- //|| FileTag->disc_number_total && g_utf8_strlen(FileTag->disc_number_total, -1) > 0)
- {
-- uint16_t disk = 0;
-- uint16_t disktotal = 0;
--
- /* At the present time, we manage only disk number like '1' or '1/2', we
- * don't use disk number total... so here we try to decompose */
- if (FileTag->disc_number)
-@@ -314,27 +343,24 @@
- {
- // A disc_number_total was entered
- if ( (tmp+1) && atoi(tmp+1) )
-- disktotal = atoi(tmp+1);
-+ td.total = atoi(tmp+1);
-
- // Fill disc_number
- *tmp = '\0';
-- disk = atoi(dn_tmp);
-+ td.index = atoi(dn_tmp);
- }else
- {
-- disk = atoi(FileTag->disc_number);
-+ td.index = atoi(FileTag->disc_number);
-+ td.total = NULL;
- }
- g_free(dn_tmp);
- }
-- /*if (FileTag->disc_number)
-- disk = atoi(FileTag->disc_number);
-- if (FileTag->disc_number_total)
-- disktotal = atoi(FileTag->disc_number_total);
-- */
-- MP4SetMetadataDisk(mp4file, disk, disktotal);
-+ MP4TagsSetDisk(tags, &td);
- }else
- {
-- //MP4DeleteMetadataDisk(mp4file);
-- MP4SetMetadataDisk(mp4file, 0, 0);
-+ td.index = NULL;
-+ td.total = NULL;
-+ MP4TagsSetDisk(tags, &td);
- }
-
- /********
-@@ -342,30 +368,29 @@
- ********/
- if (FileTag->year && g_utf8_strlen(FileTag->year, -1) > 0)
- {
-- MP4SetMetadataYear(mp4file, FileTag->year);
-+ MP4TagsSetReleaseDate(tags, FileTag->year);
- }else
- {
-- //MP4DeleteMetadataYear(mp4file);
-- MP4SetMetadataYear(mp4file, "");
-+ MP4TagsSetReleaseDate(tags, "");
- }
-
- /*************************
- * Track and Total Track *
- *************************/
-+ MP4TagTrack tt;
- if ( (FileTag->track && g_utf8_strlen(FileTag->track, -1) > 0)
- || (FileTag->track_total && g_utf8_strlen(FileTag->track_total, -1) > 0) )
- {
-- uint16_t track = 0;
-- uint16_t track_total = 0;
- if (FileTag->track)
-- track = atoi(FileTag->track);
-+ tt.index = atoi(FileTag->track);
- if (FileTag->track_total)
-- track_total = atoi(FileTag->track_total);
-- MP4SetMetadataTrack(mp4file, track, track_total);
-+ tt.total = atoi(FileTag->track_total);
-+ MP4TagsSetTrack(tags, &tt);
- }else
- {
-- //MP4DeleteMetadataTrack(mp4file);
-- MP4SetMetadataTrack(mp4file, 0, 0);
-+ tt.index = NULL;
-+ tt.total = NULL;
-+ MP4TagsSetTrack(tags, &tt);
- }
-
- /*********
-@@ -373,11 +398,10 @@
- *********/
- if (FileTag->genre && g_utf8_strlen(FileTag->genre, -1) > 0 )
- {
-- MP4SetMetadataGenre(mp4file, FileTag->genre);
-+ MP4TagsSetGenre(tags, FileTag->genre);
- }else
- {
-- //MP4DeleteMetadataGenre(mp4file);
-- MP4SetMetadataGenre(mp4file, "");
-+ MP4TagsSetGenre(tags, "");
- }
-
- /***********
-@@ -385,11 +409,10 @@
- ***********/
- if (FileTag->comment && g_utf8_strlen(FileTag->comment, -1) > 0)
- {
-- MP4SetMetadataComment(mp4file, FileTag->comment);
-+ MP4TagsSetComments(tags, FileTag->comment);
- }else
- {
-- //MP4DeleteMetadataComment(mp4file);
-- MP4SetMetadataComment(mp4file, "");
-+ MP4TagsSetComments(tags, "");
- }
-
- /**********************
-@@ -397,11 +420,10 @@
- **********************/
- if (FileTag->composer && g_utf8_strlen(FileTag->composer, -1) > 0)
- {
-- MP4SetMetadataWriter(mp4file, FileTag->composer);
-+ MP4TagsSetComposer(tags, FileTag->composer);
- }else
- {
-- //MP4DeleteMetadataWriter(mp4file);
-- MP4SetMetadataWriter(mp4file, "");
-+ MP4TagsSetComposer(tags, "");
- }
-
- /*****************
-@@ -409,33 +431,39 @@
- *****************/
- if (FileTag->encoded_by && g_utf8_strlen(FileTag->encoded_by, -1) > 0)
- {
-- MP4SetMetadataTool(mp4file, FileTag->encoded_by);
-+ MP4TagsSetEncodedBy(tags, FileTag->encoded_by);
- }else
- {
-- //MP4DeleteMetadataTool(mp4file);
-- MP4SetMetadataTool(mp4file, "");
-+ MP4TagsSetEncodedBy(tags, "");
- }
-
- /***********
- * Picture *
- ***********/
-+ Picture *pic = FileTag->picture;
-+ const gint artworkCount = tags->artworkCount;
-+
-+ for (pic_num = 0; pic_num < artworkCount; pic_num++)
- {
-- // Can handle only one picture...
-- Picture *pic;
-+ MP4TagsRemoveArtwork(tags, 0);
-+ }
-
-- //MP4DeleteMetadataCoverArt(mp4file);
-- MP4SetMetadataCoverArt(mp4file, NULL, 0);
-- for( pic = FileTag->picture; pic; pic = pic->next )
-+ while (pic)
-+ {
-+ if (pic->data)
- {
-- if( pic->type == PICTURE_TYPE_FRONT_COVER )
-- {
-- MP4SetMetadataCoverArt(mp4file, pic->data, pic->size);
-- }
-+ MP4TagArtwork art;
-+ art.data = pic->data;
-+ art.size = pic->size;
-+ art.type = MP4_ART_UNDEFINED; // delegate typing to libmp4v2
-+ MP4TagsAddArtwork(tags, &art);
- }
-+ pic = pic->next;
- }
-
--
-- MP4Close(mp4file);
-+ MP4TagsStore(tags, mp4file);
-+ MP4TagsFree(tags);
-+ MP4Close(mp4file, 0);
-
- if (error) return FALSE;
- else return TRUE;
---- src/picture.c
-+++ src/picture.c
-@@ -326,24 +326,7 @@
- else if (MESSAGE_BOX_POSITION_MOUSE)
- gtk_window_set_position(GTK_WINDOW(FileSelectionWindow),GTK_WIN_POS_MOUSE);
-
-- // Behaviour following the tag type...
-- switch (ETCore->ETFileDisplayed->ETFileDescription->TagType)
-- {
-- case MP4_TAG:
-- {
-- // Only one file can be selected
-- gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(FileSelectionWindow), FALSE);
-- break;
-- }
--
-- // Other tag types
-- default:
-- {
-- gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(FileSelectionWindow), TRUE);
-- break;
-- }
-- }
--
-+ gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(FileSelectionWindow), TRUE);
- gtk_dialog_set_default_response(GTK_DIALOG(FileSelectionWindow), GTK_RESPONSE_OK);
-
- // Starting directory (the same of the current file)
diff --git a/extra/easytag/easytag-2.1.8-fix_mime_directory_association.patch b/extra/easytag/easytag-2.1.8-fix_mime_directory_association.patch
new file mode 100644
index 000000000..49bcd72da
--- /dev/null
+++ b/extra/easytag/easytag-2.1.8-fix_mime_directory_association.patch
@@ -0,0 +1,11 @@
+--- easytag.desktop.in.orig 2013-02-21 21:34:14.651046456 +0100
++++ easytag.desktop.in 2013-02-21 21:34:29.327914099 +0100
+@@ -6,7 +6,7 @@
+ Type=Application
+ Icon=easytag
+ Categories=GTK;AudioVideo;AudioVideoEditing;
+-MimeType=x-directory/normal;inode/directory;audio/x-mp3;audio/x-mpeg;audio/mpeg;application/ogg;audio/x-vorbis+ogg;audio/x-flac;audio/x-musepack;audio/x-ape;
++MimeType=audio/x-mp3;audio/x-mpeg;audio/mpeg;application/ogg;audio/x-vorbis+ogg;audio/x-flac;audio/x-musepack;audio/x-ape;
+ Exec=easytag %F
+ Terminal=false
+ StartupNotify=true
diff --git a/extra/easytag/easytag-2.1.8-fix_mixed_declarations_and_code.patch b/extra/easytag/easytag-2.1.8-fix_mixed_declarations_and_code.patch
new file mode 100644
index 000000000..ff7a52a94
--- /dev/null
+++ b/extra/easytag/easytag-2.1.8-fix_mixed_declarations_and_code.patch
@@ -0,0 +1,43 @@
+--- src/wavpack_tag.c
++++ src/wavpack_tag.c
+@@ -82,15 +82,15 @@ gboolean Wavpack_Tag_Write_File (FILE *file_in, gchar *filename_in, vcedit_state
+ */
+ gboolean Wavpack_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
+ {
+- if (!filename || !FileTag)
+- return FALSE;
+-
+ WavpackContext *wpc;
+ gchar *field, *field2;
+ guint length;
+
+ int open_flags = OPEN_TAGS;
+
++ if (!filename || !FileTag)
++ return FALSE;
++
+ wpc = WavpackOpenFileInput(filename, NULL, open_flags, 0);
+
+ if ( wpc == NULL ) {
+@@ -271,9 +271,6 @@ gboolean Wavpack_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
+
+ gboolean Wavpack_Tag_Write_File_Tag (ET_File *ETFile)
+ {
+- if (!ETFile || !ETFile->FileTag)
+- return FALSE;
+-
+ WavpackContext *wpc;
+
+ gchar *filename = ((File_Name *)((GList *)ETFile->FileNameCur)->data)->value;
+@@ -282,6 +279,9 @@ gboolean Wavpack_Tag_Write_File_Tag (ET_File *ETFile)
+
+ int open_flags = OPEN_EDIT_TAGS;
+
++ if (!ETFile || !ETFile->FileTag)
++ return FALSE;
++
+ wpc = WavpackOpenFileInput(filename, NULL, open_flags, 0);
+
+ if ( wpc == NULL ) {
+--
+cgit v0.9.1
diff --git a/extra/easytag/easytag.install b/extra/easytag/easytag.install
index 660593cf5..18405f04c 100644
--- a/extra/easytag/easytag.install
+++ b/extra/easytag/easytag.install
@@ -1,5 +1,6 @@
post_install() {
- update-desktop-database -q
+ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+ update-desktop-database -q
}
post_upgrade() {
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index 942c210d7..cff5090d8 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 176284 2013-01-28 16:48:16Z stephane $
+# $Id: PKGBUILD 178391 2013-02-21 05:39:42Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Tom K <tomk@runbox.com>
pkgname=ekiga
-pkgver=4.0.0
-pkgrel=2
+pkgver=4.0.1
+pkgrel=1
pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
url="http://www.ekiga.org"
license=(GPL)
@@ -16,13 +16,13 @@ options=(!emptydirs)
groups=('gnome-extra')
install=ekiga.install
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('69c544fb0f2e9cb425b9dae131b01e256ad20fd597f1faf0c28f5930b0f1d998')
+sha256sums=('5f4f491c9496cf65ba057a9345d6bb0278f4eca07bcda5baeecf50bfcd9a4a3b')
build() {
cd "$pkgname-$pkgver"
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-schemas-install \
- --disable-scrollkeeper --enable-dbus
+ --disable-scrollkeeper --enable-dbus --enable-avahi
make
}
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 3230809f3..7eed96c2c 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 178128 2013-02-16 22:48:47Z ioni $
+# $Id: PKGBUILD 178409 2013-02-21 12:49:48Z ioni $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
# Contributor: Paul Mattal <paul@archlinux.org>
pkgname=ffmpeg
pkgver=1.1.2
-pkgrel=2
+pkgrel=3
epoch=1
pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
arch=('i686' 'x86_64' 'mips64el')
@@ -21,8 +21,10 @@ if [ "${CARCH}" != "mips64el" ]; then
depends+=('libva')
makedepends=('yasm' 'libvdpau')
fi
-source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2)
-sha256sums=('dc91e4a2499b05740cfddc2b679694e5c0f2ca20c94191de82d7eb200e8c48ce')
+source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2
+ h264-vdpau.patch)
+sha256sums=('dc91e4a2499b05740cfddc2b679694e5c0f2ca20c94191de82d7eb200e8c48ce'
+ 'f55f31a40627ac375fa903c958f34af0f4c72dd9f64dd5f4f64320bb6f126f42')
build() {
cd $pkgname-$pkgver
@@ -36,6 +38,7 @@ build() {
extraconf=""
fi
+ patch -Np1 -i ../h264-vdpau.patch
./configure \
--prefix=/usr \
--disable-debug \
diff --git a/extra/ffmpeg/h264-vdpau.patch b/extra/ffmpeg/h264-vdpau.patch
new file mode 100644
index 000000000..75ebe306f
--- /dev/null
+++ b/extra/ffmpeg/h264-vdpau.patch
@@ -0,0 +1,26 @@
+X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavcodec%2Fh264.c;h=da749a241d5647751cb5a961429abb6657a79a00;hp=56ef1092bd4509697f11b76ae97757bbc03aef14;hb=c6f59b95c529baf2ea6729ab9089fddce3ddd86a;hpb=6407800521d26b103db4c22d9de709e957381e4b
+
+diff --git a/libavcodec/h264.c b/libavcodec/h264.c
+index 56ef109..da749a2 100644
+--- a/libavcodec/h264.c
++++ b/libavcodec/h264.c
+@@ -2537,11 +2537,17 @@ static enum PixelFormat get_pixel_format(H264Context *h)
+ return s->avctx->color_range == AVCOL_RANGE_JPEG ? AV_PIX_FMT_YUVJ422P
+ : AV_PIX_FMT_YUV422P;
+ } else {
+- return s->avctx->get_format(s->avctx, s->avctx->codec->pix_fmts ?
++ int i;
++ const enum AVPixelFormat * fmt = s->avctx->codec->pix_fmts ?
+ s->avctx->codec->pix_fmts :
+ s->avctx->color_range == AVCOL_RANGE_JPEG ?
+ hwaccel_pixfmt_list_h264_jpeg_420 :
+- ff_hwaccel_pixfmt_list_420);
++ ff_hwaccel_pixfmt_list_420;
++
++ for (i=0; fmt[i] != AV_PIX_FMT_NONE; i++)
++ if (fmt[i] == s->avctx->pix_fmt)
++ return fmt[i];
++ return s->avctx->get_format(s->avctx, fmt);
+ }
+ break;
+ default:
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index c64b21700..32a537b56 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 178051 2013-02-14 18:47:31Z heftig $
+# $Id: PKGBUILD 178416 2013-02-21 17:18:12Z heftig $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Flamelab <panosfilip@gmail.com
pkgname=gnome-shell
-pkgver=3.6.3
+pkgver=3.6.3.1
pkgrel=2
pkgdesc="The next generation GNOME Shell"
arch=(i686 x86_64 mips64el)
@@ -17,14 +17,17 @@ optdepends=('gnome-control-center: System settings'
options=('!libtool' '!emptydirs')
install=gnome-shell.install
groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
- fs33855.patch)
-sha256sums=('05b2341a0f84835644881743873d3eaccaed12f00aa7b424d876780e81723db2'
- '259e69256ae597f1d04c7a0070c1c90cec20afbf494d6b89e72d86b8b9c7f0ba')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
+ main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch)
+sha256sums=('4e0328d43ac443e7cc0c43bb67895112643952f14cd20fff1109c6cc5849d603'
+ '968245e7db1c6921627cf0fbce4e4504cffbdb24898f834769a23a254ed6e125')
build() {
cd $pkgname-$pkgver
- patch -Np1 -i ../fs33855.patch
+
+ # FS#32410
+ patch -Np1 -i ../main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch
+
PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
--libexecdir=/usr/lib/gnome-shell \
--localstatedir=/var --disable-static \
diff --git a/extra/gnome-shell/fs33855.patch b/extra/gnome-shell/fs33855.patch
deleted file mode 100644
index b935e0923..000000000
--- a/extra/gnome-shell/fs33855.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 9d931b5e013475be5733fc92bd105b3a691a4097 Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@src.gnome.org>
-Date: Fri, 30 Nov 2012 15:05:38 +0000
-Subject: MessageTray: fix notification height expansion
-
-MessageTray._tween removes all tweens now, so it removes also
-those setting the height to expanded for critical notifications.
-
-This is a regression from 1a27d7dfc02c06bd0ccf4258a9108207b8832ce4
-
-https://bugzilla.gnome.org/show_bug.cgi?id=689295
----
-diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
-index ce61e25..ef0cc02 100644
---- a/js/ui/messageTray.js
-+++ b/js/ui/messageTray.js
-@@ -2200,40 +2200,28 @@ const MessageTray = new Lang.Class({
- _updateShowingNotification: function() {
- this._notification.acknowledged = true;
-
-- Tweener.removeTweens(this._notificationWidget);
--
- // We auto-expand notifications with CRITICAL urgency.
-- // We use Tweener.removeTweens() to remove a tween that was hiding the notification we are
-- // updating, in case that notification was in the process of being hidden. However,
-- // Tweener.removeTweens() would also remove a tween that was updating the position of the
-- // notification we are updating, in case that notification was already expanded and its height
-- // changed. Therefore we need to call this._expandNotification() for expanded notifications
-- // to make sure their position is updated.
-- if (this._notification.urgency == Urgency.CRITICAL || this._notification.expanded)
-+ if (this._notification.urgency == Urgency.CRITICAL)
- this._expandNotification(true);
-
- // We tween all notifications to full opacity. This ensures that both new notifications and
- // notifications that might have been in the process of hiding get full opacity.
- //
-- // We tween any notification showing in the banner mode to banner height
-- // (this._notificationWidget.y = -this._notificationWidget.height).
-+ // We tween any notification showing in the banner mode to the appropriate height
-+ // (which is banner height or expanded height, depending on the notification state)
- // This ensures that both new notifications and notifications in the banner mode that might
-- // have been in the process of hiding are shown with the banner height.
-+ // have been in the process of hiding are shown with the correct height.
- //
- // We use this._showNotificationCompleted() onComplete callback to extend the time the updated
- // notification is being shown.
-- //
-- // We don't set the y parameter for the tween for expanded notifications because
-- // this._expandNotification() will result in getting this._notificationWidget.y set to the appropriate
-- // fully expanded value.
-+
- let tweenParams = { opacity: 255,
-+ y: -this._notificationWidget.height,
- time: ANIMATION_TIME,
- transition: 'easeOutQuad',
- onComplete: this._showNotificationCompleted,
- onCompleteScope: this
- };
-- if (!this._notification.expanded)
-- tweenParams.y = -this._notificationWidget.height;
-
- this._tween(this._notificationWidget, '_notificationState', State.SHOWN, tweenParams);
- },
---
-cgit v0.9.0.2
diff --git a/extra/gnome-shell/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch b/extra/gnome-shell/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch
new file mode 100644
index 000000000..b1471ce54
--- /dev/null
+++ b/extra/gnome-shell/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch
@@ -0,0 +1,29 @@
+From 742587dce258adf436f360eed183a7ca0c58fa18 Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <jstpierre@mecheye.net>
+Date: Wed, 2 Jan 2013 09:05:32 -0500
+Subject: [PATCH] main: Don't mess up the modal stack when the focus actor is
+ destroyed
+
+This seems to be an incorrect conversion when we moved from an array
+to an object of keys in 3a6b4f3.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=690965
+---
+ js/ui/main.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/ui/main.js b/js/ui/main.js
+index 12daee2..1334d58 100644
+--- a/js/ui/main.js
++++ b/js/ui/main.js
+@@ -553,7 +553,7 @@ function pushModal(actor, params) {
+ curFocusDestroyId = curFocus.connect('destroy', function() {
+ let index = _findModal(actor);
+ if (index >= 0)
+- modalActorFocusStack[index].actor = null;
++ modalActorFocusStack[index].focus = null;
+ });
+ }
+ modalActorFocusStack.push({ actor: actor,
+--
+1.8.0.2 \ No newline at end of file
diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD
index 759e76182..732fc7890 100644
--- a/extra/opal/PKGBUILD
+++ b/extra/opal/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 178139 2013-02-16 22:48:57Z ioni $
+# $Id: PKGBUILD 178390 2013-02-21 05:35:59Z heftig $
# Maintainer: Jan de Groot <jan@archlinux.org>
# Contributor: Tom K <tomk@runbox.com>
pkgname=opal
-pkgver=3.10.9
-pkgrel=2
+pkgver=3.10.10
+pkgrel=1
pkgdesc="Open Phone Abstraction Library"
arch=(i686 x86_64 'mips64el')
url="http://www.opalvoip.org"
-license=('GPL')
-depends=('ptlib' 'libtheora' 'x264' 'speex' 'gsm')
-makedepends=('ffmpeg')
+license=(GPL)
+depends=(ptlib libtheora x264 speex gsm celt)
+makedepends=(ffmpeg)
options=(!makeflags)
source=(http://ftp.gnome.org/pub/GNOME/sources/opal/${pkgver%.*}/opal-$pkgver.tar.xz
opal-ffmpeg.patch)
-sha256sums=('86c717a881f5283cfb58a5d52573c337b904115b90fa3e53c77fc543605e7950'
+sha256sums=('f208985003461b2743575eccac13ad890b3e5baac35b68ddef17162460aff864'
'd81542907ace54015b7c69c275b0c67f449eeb252ba971ba6ca728a5e20db231')
build() {
diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD
index 78dfbc75b..e5f34756a 100644
--- a/extra/openmpi/PKGBUILD
+++ b/extra/openmpi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 170075 2012-10-31 21:09:28Z stephane $
+# $Id: PKGBUILD 178423 2013-02-21 21:29:02Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
pkgname=openmpi
-pkgver=1.6.3
-pkgrel=1.1
+pkgver=1.6.4
+pkgrel=1
pkgdesc="High performance message passing library (MPI)"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.open-mpi.org"
@@ -12,7 +12,7 @@ depends=('gcc-fortran' 'openssh' 'libltdl' 'hwloc')
makedepends=('inetutils')
options=(!libtool)
source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('a61aa2dee4c47d93d88e49ebed36de25df4f6492')
+sha1sums=('38095d3453519177272f488d5058a98f7ebdbf10')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -57,9 +57,6 @@ package() {
# Openmpi's otfinfo conflicts with the one from texlive
mv "${pkgdir}"/usr/bin/otfinfo{,mpi}
- # Openmpi's otfdump conflicts with the one from libotf
- mv "${pkgdir}"/usr/bin/otfdump{,ompi}
-
# Remove dangling symlink
rm "${pkgdir}"/usr/share/man/man1/orteCC.1
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index dac0a1c5e..cee1d1651 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 178150 2013-02-17 00:23:28Z bisson $
+# $Id: PKGBUILD 178407 2013-02-21 10:10:12Z bisson $
# Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
# Contributor: Paul Mattal <paul@archlinux.org>
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=postfix
pkgver=2.10.0
-pkgrel=2
+pkgrel=3
pkgdesc='Fast, easy to administer, secure mail server'
url='http://www.postfix.org/'
license=('custom')
@@ -38,6 +38,10 @@ build() {
-DHAS_PGSQL -I/usr/include/postgresql \
-DHAS_SQLITE \
-DHAS_CDB \
+ -DDEF_MANPAGE_DIR=\"/usr/share/man\" \
+ -DDEF_DAEMON_DIR=\"/usr/lib/postfix\" \
+ -DDEF_SAMPLE_DIR=\"/etc/postfix/sample\" \
+ -DDEF_README_DIR=\"/usr/share/doc/postfix\" \
' AUXLIBS=' \
-lsasl2 \
-lldap -llber \
@@ -54,12 +58,7 @@ build() {
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- sh postfix-install -non-interactive \
- install_root="${pkgdir}" \
- daemon_directory="/usr/lib/${pkgname}" \
- sample_directory="/etc/${pkgname}/sample" \
- manpage_directory="/usr/share/man" \
- readme_directory="/usr/share/doc/${pkgname}" \
+ sh postfix-install -non-interactive install_root="${pkgdir}"
install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
diff --git a/extra/potrace/PKGBUILD b/extra/potrace/PKGBUILD
index 48f6111a7..370447a21 100644
--- a/extra/potrace/PKGBUILD
+++ b/extra/potrace/PKGBUILD
@@ -1,22 +1,27 @@
-# $Id: PKGBUILD 135877 2011-08-20 01:28:52Z bisson $
+# $Id: PKGBUILD 178385 2013-02-21 05:07:45Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Damir Perisa <damir@archlinux.org>
pkgname=potrace
-pkgver=1.10
-pkgrel=1.1
+pkgver=1.11
+pkgrel=1
pkgdesc='Utility for tracing a bitmap (input: PBM,PGM,PPM,BMP; output: EPS,PS,PDF,SVG,DXF,PGM,Gimppath,XFig)'
url='http://potrace.sourceforge.net/'
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
-depends=('zlib')
options=('!libtool')
source=("http://potrace.sourceforge.net/download/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('e6e8b64d85d30b4695d197a79187ac98c2b236f9')
+sha1sums=('7296baf27bf35298263cb3ed3df34a38fed0b441')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --mandir=/usr/share/man --with-libpotrace
+
+ ./configure \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --with-libpotrace \
+ --disable-static \
+
make
}
diff --git a/extra/ptlib/PKGBUILD b/extra/ptlib/PKGBUILD
index 3b91baba7..896725a0c 100644
--- a/extra/ptlib/PKGBUILD
+++ b/extra/ptlib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172101 2012-11-28 10:32:09Z jgc $
+# $Id: PKGBUILD 178389 2013-02-21 05:32:58Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=ptlib
-pkgver=2.10.9
-pkgrel=1.1
+pkgver=2.10.10
+pkgrel=1
pkgdesc="Portable Windows Library"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.opalvoip.org"
@@ -12,7 +12,7 @@ depends=('sdl' 'libpulse' 'v4l-utils' 'libldap')
replaces=('pwlib')
conflicts=('pwlib')
source=(http://ftp.gnome.org/pub/GNOME/sources/ptlib/${pkgver%.*}/ptlib-$pkgver.tar.xz)
-sha256sums=('d948e326ce238880ce9b52f9f0cd76a4897618e17cc08a347e4a713f36a575fe')
+sha256sums=('7fcaabe194cbd3bc0b370b951dffd19cfe7ea0298bfff6aecee948e97f3207e4')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 53f26e112..83cd9437c 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id$
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-spacenav=true
+spacenav=false
pkgbase=blender-libre
pkgflag=-libre
if [ $spacenav == true ]; then
@@ -16,9 +16,9 @@ else
spndesc=''
fi
pkgdesc="Fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support$spndesc"
-pkgver=2.65a
-pkgrel=2
-pkgaev=6
+pkgver=2.66
+pkgrel=1
+pkgaev=7
arch=(
i686
x86_64
@@ -137,7 +137,7 @@ source=(
"http://download.${pkgbase%$pkgflag}.org/source/${pkgbase%$pkgflag}-$pkgver.tar.gz"
)
sha512sums=(
- 02d493a7395160047b39dcfb48dbd45c285fbeaec741d4248bef62a8da8743e6bf59bba4ecc401e35c0f21a8db4e883c9b29d620be6c4dd6d4852ae53e7c978f
+ f76499edc5f8179a42ec6d6334c6fa03f830570d054061ae40c2e8e1ec0a0090efcbb642f4f7f3b99d3941d4c4b791a0e357a275acf1b3ac251d58906f23b2b4
)
build() {
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 337688d9c..1a55d6999 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -13,10 +13,10 @@
# If you are updating this package, don't forget to update the version number in
# the value for 'browser.dictionaries.download.url' in 'libre.patch'
-_pgo=false
+_pgo=true
pkgname=icecat
pkgver=17.0.1
-pkgrel=6
+pkgrel=7
pkgdesc='GNU IceCat, the standalone web browser based on Mozilla Firefox.'
arch=(i686 x86_64 mips64el)
license=(MPL GPL LGPL)
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index c2c6adaa5..0a3225605 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -10,7 +10,7 @@
# Contributor: evr <evanroman at gmail>
# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>
-_pgo=false
+_pgo=true
# We're getting this from Debian Experimental
_debname=iceweasel
@@ -22,12 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=iceweasel
pkgname=iceweasel-libre
pkgver=$_debver.$_debrel
-pkgrel=1
-
-if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
-if $_pgo; then
- pkgname+='-pgo'
-fi
+pkgrel=2
pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
index ebdca122c..9014b1723 100644
--- a/libre/linux-libre-firmware/PKGBUILD
+++ b/libre/linux-libre-firmware/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: Márcio Silva <coadde@lavabit.com>
pkgname=linux-libre-firmware
-pkgver=3.7
-pkgrel=4
+pkgver=3.8
+pkgrel=1
pkgdesc='Free firmware files for Linux-libre'
arch=('any')
url='http://linux-libre.fsfla.org/'
@@ -36,7 +36,7 @@ replaces=('linux-firmware'
'rt2x00-rt61-fw'
'rt2x00-rt71w-fw')
source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz")
-md5sums=('06bf9601d859531e7378eb43d4ca7dd3')
+md5sums=('84c2a77910932ffc7d958744ac9cf2f5')
package() {
cd $srcdir/linux-$pkgver
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 8567f9693..756507986 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
# Maintainer: André Silva <emulatorman@lavabit.com>
-_kernver=3.7.9
+_kernver=3.8
_kernrel=1
pkgname=('linux-libre-kmod-alx')
-_version=v3.8-rc7
-_pkgver=3.8-rc7-1-u
-pkgver=3.8rc7.1
-pkgrel=3
+_version=v3.8
+_pkgver=3.8-1-u
+pkgver=3.8.1
+pkgrel=1
pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
arch=('i686' 'x86_64')
url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
@@ -19,12 +19,12 @@ provides=('alx' 'alx-driver' 'dkms-alx')
conflicts=('alx' 'alx-driver' 'dkms-alx')
source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_version/compat-drivers-$_pkgver.tar.xz)
-md5sums=('3a1c7f870ff2fb96534b0d69245a4dab')
+md5sums=('557e3099c642455ec272d9ddf46de484')
build() {
# current extramodules version
- _extraver=extramodules-3.7-LIBRE
+ _extraver=extramodules-3.8-LIBRE
cd $srcdir/compat-drivers-$_pkgver
diff --git a/libre/linux-libre-kmod-alx/linux-libre-kmod-alx.install b/libre/linux-libre-kmod-alx/linux-libre-kmod-alx.install
index aad4270cd..069348192 100644
--- a/libre/linux-libre-kmod-alx/linux-libre-kmod-alx.install
+++ b/libre/linux-libre-kmod-alx/linux-libre-kmod-alx.install
@@ -30,4 +30,3 @@ post_remove() {
rmmod compat
echo " Module unloaded!."
}
-
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index ff2e7283e..13ca9d56d 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178202 2013-02-18 00:58:40Z foutrelis $
+# $Id: PKGBUILD 178342 2013-02-20 12:32:29Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
@@ -9,18 +9,19 @@
pkgbase=linux-libre # Build stock -LIBRE kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
-_basekernel=3.7
-_sublevel=9
-pkgver=${_basekernel}.${_sublevel}
+_basekernel=3.8
+#_sublevel=9
+#pkgver=${_basekernel}.${_sublevel}
+pkgver=${_basekernel}
pkgrel=1
-_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver
+#_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
makedepends=('xmlto' 'docbook-xsl')
options=('!strip')
-source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"{,.sign}
- "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"{,.sign}
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
+ #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
# the main kernel config files
'config.i686' 'config.x86_64'
# standard config files for mkinitcpio ramdisk
@@ -29,12 +30,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'Kbuild.platforms'
'boot-logo.patch'
'change-default-console-loglevel.patch'
- 'fat-3.6.x.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
-md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
- 'bcffd9fa99c4db6905dc6b22d71cb17a'
- '53c782740eb3ddf875ad98c31c1bf213'
- '71a6f703cb0bee098a76ea42d5836d06'
+md5sums=('84c2a77910932ffc7d958744ac9cf2f5'
+ 'd0ceaebf20b53184c50e7f4980ed45d1'
+ '0b483b23413dbc451f2b041b9a475c03'
'e49ac236dfeef709f91a3d993ea7b62c'
'2967cecc3af9f954ccc822fd63dca6ff'
'8267264d9a8966e57fdacd1fa1fc65c4'
@@ -46,9 +45,6 @@ if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
unset md5sums[${#md5sums[@]}-1]
-# twice since we include signatures
- unset source[${#source[@]}-1]
- unset md5sums[${#md5sums[@]}-1]
fi
_kernelname=${pkgbase#linux-libre}
@@ -69,10 +65,6 @@ build() {
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
- # fix cosmetic fat issue
- # https://bugs.archlinux.org/task/32916
- patch -Np1 -i "${srcdir}/fat-3.6.x.patch"
-
if [ "$CARCH" == "mips64el" ]; then
sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index e6ffc0759..1491a2ff6 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.7.6-1 Kernel Configuration
+# Linux/i386 3.8.0 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -74,7 +74,7 @@ CONFIG_AUDIT=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT_WATCH=y
CONFIG_AUDIT_TREE=y
-# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
+CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
CONFIG_HAVE_GENERIC_HARDIRQS=y
#
@@ -126,10 +126,13 @@ CONFIG_RCU_FANOUT_LEAF=16
CONFIG_RCU_FAST_NO_HZ=y
# CONFIG_TREE_RCU_TRACE is not set
# CONFIG_RCU_BOOST is not set
+CONFIG_RCU_NOCB_CPU=y
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=19
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
CONFIG_CGROUPS=y
# CONFIG_CGROUP_DEBUG is not set
CONFIG_CGROUP_FREEZER=y
@@ -240,13 +243,13 @@ CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
CONFIG_HAVE_CMPXCHG_LOCAL=y
CONFIG_HAVE_CMPXCHG_DOUBLE=y
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_GENERIC_KERNEL_THREAD=y
-CONFIG_GENERIC_KERNEL_EXECVE=y
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
CONFIG_SECCOMP_FILTER=y
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_GENERIC_SIGALTSTACK=y
+CONFIG_CLONE_BACKWARDS=y
#
# GCOV-based kernel profiling
@@ -333,7 +336,6 @@ CONFIG_PARAVIRT_CLOCK=y
# CONFIG_PARAVIRT_DEBUG is not set
CONFIG_NO_BOOTMEM=y
# CONFIG_MEMTEST is not set
-# CONFIG_M386 is not set
# CONFIG_M486 is not set
# CONFIG_M586 is not set
# CONFIG_M586TSC is not set
@@ -360,14 +362,8 @@ CONFIG_M686=y
# CONFIG_MATOM is not set
CONFIG_X86_GENERIC=y
CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_CMPXCHG=y
CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_XADD=y
# CONFIG_X86_PPRO_FENCE is not set
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_INVLPG=y
-CONFIG_X86_BSWAP=y
-CONFIG_X86_POPAD_OK=y
CONFIG_X86_INTEL_USERCOPY=y
CONFIG_X86_USE_PPRO_CHECKSUM=y
CONFIG_X86_TSC=y
@@ -430,6 +426,7 @@ CONFIG_ARCH_DISCARD_MEMBLOCK=y
CONFIG_MEMORY_ISOLATION=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_BALLOON_COMPACTION=y
CONFIG_COMPACTION=y
CONFIG_MIGRATION=y
# CONFIG_PHYS_ADDR_T_64BIT is not set
@@ -479,6 +476,8 @@ CONFIG_RELOCATABLE=y
CONFIG_X86_NEED_RELOCS=y
CONFIG_PHYSICAL_ALIGN=0x100000
CONFIG_HOTPLUG_CPU=y
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
# CONFIG_COMPAT_VDSO is not set
# CONFIG_CMDLINE_BOOL is not set
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -517,12 +516,14 @@ CONFIG_ACPI_BUTTON=m
CONFIG_ACPI_VIDEO=m
CONFIG_ACPI_FAN=m
CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_I2C=m
CONFIG_ACPI_PROCESSOR=m
CONFIG_ACPI_IPMI=m
CONFIG_ACPI_HOTPLUG_CPU=y
CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
CONFIG_ACPI_THERMAL=m
# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
CONFIG_ACPI_BLACKLIST_YEAR=0
# CONFIG_ACPI_DEBUG is not set
CONFIG_ACPI_PCI_SLOT=m
@@ -552,6 +553,7 @@ CONFIG_APM_DO_ENABLE=y
#
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
CONFIG_CPU_FREQ_STAT=m
CONFIG_CPU_FREQ_STAT_DETAILS=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
@@ -590,6 +592,7 @@ CONFIG_X86_E_POWERSAVER=m
CONFIG_X86_SPEEDSTEP_LIB=m
CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
CONFIG_CPU_IDLE=y
+# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y
# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
@@ -1077,9 +1080,11 @@ CONFIG_IP_SCTP=m
CONFIG_NET_SCTPPROBE=m
# CONFIG_SCTP_DBG_MSG is not set
# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-CONFIG_SCTP_HMAC_SHA1=y
-# CONFIG_SCTP_HMAC_MD5 is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
# CONFIG_RDS is not set
# CONFIG_TIPC is not set
CONFIG_ATM=m
@@ -1097,7 +1102,11 @@ CONFIG_L2TP_ETH=m
CONFIG_STP=m
CONFIG_BRIDGE=m
CONFIG_BRIDGE_IGMP_SNOOPING=y
-# CONFIG_NET_DSA is not set
+CONFIG_HAVE_NET_DSA=y
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_DSA=y
+CONFIG_NET_DSA_TAG_EDSA=y
+CONFIG_NET_DSA_TAG_TRAILER=y
CONFIG_VLAN_8021Q=m
# CONFIG_VLAN_8021Q_GVRP is not set
# CONFIG_DECNET is not set
@@ -1182,6 +1191,7 @@ CONFIG_NET_SCH_FIFO=y
CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m
CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_OPENVSWITCH=m
CONFIG_RPS=y
@@ -1392,6 +1402,7 @@ CONFIG_EXTRA_FIRMWARE=""
# CONFIG_GENERIC_CPU_DEVICES is not set
CONFIG_REGMAP=y
CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_MMIO=m
CONFIG_REGMAP_IRQ=y
CONFIG_DMA_SHARED_BUFFER=y
# CONFIG_CMA is not set
@@ -1399,7 +1410,6 @@ CONFIG_DMA_SHARED_BUFFER=y
#
# Bus devices
#
-CONFIG_OMAP_OCP2SCP=m
CONFIG_CONNECTOR=y
CONFIG_PROC_EVENTS=y
CONFIG_MTD=m
@@ -1746,6 +1756,9 @@ CONFIG_MEGARAID_SAS=m
CONFIG_SCSI_MPT2SAS=m
CONFIG_SCSI_MPT2SAS_MAX_SGE=128
# CONFIG_SCSI_MPT2SAS_LOGGING is not set
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_LOGGING=y
CONFIG_SCSI_UFSHCD=m
CONFIG_SCSI_HPTIOP=m
CONFIG_SCSI_BUSLOGIC=m
@@ -1809,6 +1822,7 @@ CONFIG_SCSI_PM8001=m
CONFIG_SCSI_SRP=m
CONFIG_SCSI_BFA_FC=m
CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
CONFIG_SCSI_LOWLEVEL_PCMCIA=y
CONFIG_PCMCIA_AHA152X=m
CONFIG_PCMCIA_FDOMAIN=m
@@ -2058,6 +2072,15 @@ CONFIG_CAIF_TTY=m
CONFIG_CAIF_SPI_SLAVE=m
CONFIG_CAIF_SPI_SYNC=y
CONFIG_CAIF_HSI=m
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
+CONFIG_NET_DSA_MV88E6131=m
+CONFIG_NET_DSA_MV88E6123_61_65=m
CONFIG_ETHERNET=y
CONFIG_MDIO=m
CONFIG_NET_VENDOR_3COM=y
@@ -2085,6 +2108,9 @@ CONFIG_ATL2=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=m
+CONFIG_NET_CADENCE=y
+CONFIG_ARM_AT91_ETHER=m
+CONFIG_MACB=m
CONFIG_NET_VENDOR_BROADCOM=y
CONFIG_B44=m
CONFIG_B44_PCI_AUTOSELECT=y
@@ -2147,13 +2173,11 @@ CONFIG_E1000=m
CONFIG_E1000E=m
CONFIG_IGB=m
CONFIG_IGB_DCA=y
-CONFIG_IGB_PTP=y
CONFIG_IGBVF=m
CONFIG_IXGB=m
CONFIG_IXGBE=m
CONFIG_IXGBE_HWMON=y
CONFIG_IXGBE_DCA=y
-CONFIG_IXGBE_PTP=y
CONFIG_IXGBEVF=m
CONFIG_NET_VENDOR_I825XX=y
CONFIG_ELPLUS=m
@@ -2167,6 +2191,7 @@ CONFIG_ZNET=m
CONFIG_IP1000=m
CONFIG_JME=m
CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
CONFIG_SKGE=m
# CONFIG_SKGE_DEBUG is not set
CONFIG_SKGE_GENESIS=y
@@ -2203,7 +2228,6 @@ CONFIG_NET_VENDOR_NVIDIA=y
CONFIG_FORCEDETH=m
CONFIG_NET_VENDOR_OKI=y
CONFIG_PCH_GBE=m
-CONFIG_PCH_PTP=y
CONFIG_ETHOC=m
CONFIG_NET_PACKET_ENGINE=y
CONFIG_HAMACHI=m
@@ -2236,7 +2260,6 @@ CONFIG_SFC=m
CONFIG_SFC_MTD=y
CONFIG_SFC_MCDI_MON=y
CONFIG_SFC_SRIOV=y
-CONFIG_SFC_PTP=y
CONFIG_NET_VENDOR_SMSC=y
CONFIG_SMC9194=m
CONFIG_PCMCIA_SMC91C92=m
@@ -2331,6 +2354,7 @@ CONFIG_USB_NET_AX8817X=m
CONFIG_USB_NET_CDCETHER=m
CONFIG_USB_NET_CDC_EEM=m
CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
CONFIG_USB_NET_DM9601=m
CONFIG_USB_NET_SMSC75XX=m
CONFIG_USB_NET_SMSC95XX=m
@@ -2378,6 +2402,7 @@ CONFIG_ADM8211=m
# CONFIG_MAC80211_HWSIM is not set
CONFIG_MWL8K=m
CONFIG_ATH_COMMON=m
+CONFIG_ATH_CARDS=m
# CONFIG_ATH_DEBUG is not set
CONFIG_ATH5K=m
# CONFIG_ATH5K_DEBUG is not set
@@ -2401,6 +2426,9 @@ CONFIG_ATH6KL=m
CONFIG_ATH6KL_SDIO=m
CONFIG_ATH6KL_USB=m
# CONFIG_ATH6KL_DEBUG is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
CONFIG_B43=m
CONFIG_B43_BCMA=y
# CONFIG_B43_BCMA_EXTRA is not set
@@ -2434,7 +2462,7 @@ CONFIG_BRCMFMAC=m
CONFIG_BRCMFMAC_SDIO=y
# CONFIG_BRCMFMAC_SDIO_OOB is not set
CONFIG_BRCMFMAC_USB=y
-# CONFIG_BRCMISCAN is not set
+# CONFIG_BRCM_TRACING is not set
# CONFIG_BRCMDBG is not set
CONFIG_HOSTAP=m
CONFIG_HOSTAP_FIRMWARE=y
@@ -2453,7 +2481,6 @@ CONFIG_IWLDVM=m
# CONFIG_IWLWIFI_DEBUG is not set
CONFIG_IWLWIFI_DEVICE_TRACING=y
# CONFIG_IWLWIFI_P2P is not set
-# CONFIG_IWLWIFI_EXPERIMENTAL_MFP is not set
CONFIG_IWLEGACY=m
CONFIG_IWL4965=m
CONFIG_IWL3945=m
@@ -2509,6 +2536,7 @@ CONFIG_RT2X00_LIB_LEDS=y
CONFIG_RTL8192CE=m
CONFIG_RTL8192SE=m
CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
CONFIG_RTL8192CU=m
CONFIG_RTLWIFI=m
# CONFIG_RTLWIFI_DEBUG is not set
@@ -2731,7 +2759,6 @@ CONFIG_KEYBOARD_MPR121=m
# CONFIG_KEYBOARD_OPENCORES is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_OMAP4 is not set
# CONFIG_KEYBOARD_XTKBD is not set
CONFIG_INPUT_MOUSE=y
CONFIG_MOUSE_PS2=m
@@ -2823,6 +2850,7 @@ CONFIG_TOUCHSCREEN_PENMOUNT=m
CONFIG_TOUCHSCREEN_EDT_FT5X06=m
CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
CONFIG_TOUCHSCREEN_UCB1400=m
CONFIG_TOUCHSCREEN_PIXCIR=m
CONFIG_TOUCHSCREEN_WM97XX=m
@@ -2874,9 +2902,11 @@ CONFIG_INPUT_KXTJ9=m
CONFIG_INPUT_POWERMATE=m
CONFIG_INPUT_YEALINK=m
CONFIG_INPUT_CM109=m
+CONFIG_INPUT_RETU_PWRBUTTON=m
CONFIG_INPUT_UINPUT=m
CONFIG_INPUT_PCF50633_PMU=m
CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_PWM_BEEPER=m
CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
CONFIG_INPUT_ADXL34X=m
CONFIG_INPUT_ADXL34X_I2C=m
@@ -2896,6 +2926,7 @@ CONFIG_SERIO_LIBPS2=y
CONFIG_SERIO_RAW=m
CONFIG_SERIO_ALTERA_PS2=m
CONFIG_SERIO_PS2MULT=m
+CONFIG_SERIO_ARC_PS2=m
CONFIG_GAMEPORT=m
CONFIG_GAMEPORT_NS558=m
CONFIG_GAMEPORT_L4=m
@@ -2962,6 +2993,8 @@ CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
CONFIG_SERIAL_PCH_UART=m
CONFIG_SERIAL_XILINX_PS_UART=m
+CONFIG_SERIAL_ARC=m
+CONFIG_SERIAL_ARC_NR_PORTS=1
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
CONFIG_PPDEV=m
@@ -3051,6 +3084,7 @@ CONFIG_I2C_SCMI=m
#
# I2C system bus drivers (mostly embedded / system-on-chip)
#
+# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_DESIGNWARE_CORE=m
CONFIG_I2C_DESIGNWARE_PCI=m
CONFIG_I2C_EG20T=m
@@ -3071,6 +3105,7 @@ CONFIG_I2C_PARPORT=m
CONFIG_I2C_PARPORT_LIGHT=m
CONFIG_I2C_TAOS_EVM=m
CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
#
# Other I2C/SMBus bus drivers
@@ -3111,6 +3146,7 @@ CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
CONFIG_GPIOLIB=y
CONFIG_OF_GPIO=y
+CONFIG_GPIO_ACPI=y
# CONFIG_DEBUG_GPIO is not set
CONFIG_GPIO_SYSFS=y
@@ -3119,6 +3155,7 @@ CONFIG_GPIO_SYSFS=y
#
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_TS5500 is not set
CONFIG_GPIO_SCH=m
CONFIG_GPIO_ICH=m
# CONFIG_GPIO_VX855 is not set
@@ -3158,6 +3195,11 @@ CONFIG_GPIO_UCB1400=y
#
# MODULbus GPIO expanders:
#
+
+#
+# USB GPIO expanders:
+#
+CONFIG_GPIO_VIPERBOARD=m
# CONFIG_W1 is not set
CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
@@ -3176,7 +3218,10 @@ CONFIG_BATTERY_OLPC=m
# CONFIG_CHARGER_MAX8903 is not set
# CONFIG_CHARGER_LP8727 is not set
# CONFIG_CHARGER_GPIO is not set
+# CONFIG_CHARGER_BQ2415X is not set
# CONFIG_CHARGER_SMB347 is not set
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_GPIO=y
CONFIG_POWER_AVS=y
CONFIG_HWMON=y
CONFIG_HWMON_VID=m
@@ -3311,6 +3356,12 @@ CONFIG_SENSORS_ACPI_POWER=m
CONFIG_SENSORS_ATK0110=m
CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+CONFIG_FAIR_SHARE=y
+CONFIG_STEP_WISE=y
+# CONFIG_USER_SPACE is not set
# CONFIG_CPU_THERMAL is not set
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
@@ -3394,6 +3445,7 @@ CONFIG_SSB_SDIOHOST=y
# CONFIG_SSB_DEBUG is not set
CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_SSB_DRIVER_GPIO=y
CONFIG_BCMA_POSSIBLE=y
#
@@ -3404,6 +3456,7 @@ CONFIG_BCMA_BLOCKIO=y
CONFIG_BCMA_HOST_PCI_POSSIBLE=y
CONFIG_BCMA_HOST_PCI=y
CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
# CONFIG_BCMA_DEBUG is not set
#
@@ -3412,6 +3465,8 @@ CONFIG_BCMA_DRIVER_GMAC_CMN=y
CONFIG_MFD_CORE=y
CONFIG_MFD_SM501=m
CONFIG_MFD_SM501_GPIO=y
+CONFIG_MFD_RTSX_PCI=m
+CONFIG_MFD_TI_AM335X_TSCADC=m
CONFIG_HTC_PASIC3=m
CONFIG_UCB1400_CORE=m
CONFIG_MFD_LM3533=m
@@ -3440,6 +3495,8 @@ CONFIG_MFD_RDC321X=m
CONFIG_MFD_VX855=m
CONFIG_MFD_WL1273_CORE=m
# CONFIG_MFD_SYSCON is not set
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_RETU=m
# CONFIG_REGULATOR is not set
CONFIG_MEDIA_SUPPORT=m
@@ -3759,10 +3816,16 @@ CONFIG_RADIO_WL128X=m
#
CONFIG_DVB_FIREDTV=m
CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
CONFIG_DVB_B2C2_FLEXCOP=m
CONFIG_VIDEO_SAA7146=m
CONFIG_VIDEO_SAA7146_VV=m
CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
#
@@ -4138,6 +4201,7 @@ CONFIG_LCD_PLATFORM=m
CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_BACKLIGHT_GENERIC is not set
CONFIG_BACKLIGHT_LM3533=m
+CONFIG_BACKLIGHT_PWM=m
CONFIG_BACKLIGHT_APPLE=m
# CONFIG_BACKLIGHT_SAHARA is not set
# CONFIG_BACKLIGHT_ADP8860 is not set
@@ -4172,6 +4236,7 @@ CONFIG_FONT_8x16=y
# CONFIG_FONT_10x18 is not set
CONFIG_FONT_AUTOSELECT=y
# CONFIG_LOGO is not set
+CONFIG_FB_SSD1307=m
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE=y
# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
@@ -4367,6 +4432,7 @@ CONFIG_SND_FIREWIRE=y
CONFIG_SND_FIREWIRE_LIB=m
CONFIG_SND_FIREWIRE_SPEAKERS=m
CONFIG_SND_ISIGHT=m
+CONFIG_SND_SCS1X=m
CONFIG_SND_PCMCIA=y
CONFIG_SND_VXPOCKET=m
CONFIG_SND_PDAUDIOCF=m
@@ -4407,6 +4473,7 @@ CONFIG_HID_KYE=m
CONFIG_HID_UCLOGIC=m
CONFIG_HID_WALTOP=m
CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
CONFIG_HID_TWINHAN=m
CONFIG_HID_KENSINGTON=m
CONFIG_HID_LCPOWER=m
@@ -4463,6 +4530,11 @@ CONFIG_HID_SENSOR_HUB=m
CONFIG_USB_HID=m
CONFIG_HID_PID=y
CONFIG_USB_HIDDEV=y
+
+#
+# I2C HID support
+#
+CONFIG_I2C_HID=m
CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB_ARCH_HAS_EHCI=y
CONFIG_USB_ARCH_HAS_XHCI=y
@@ -4494,6 +4566,7 @@ CONFIG_USB_XHCI_HCD=m
CONFIG_USB_EHCI_HCD=m
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=m
CONFIG_USB_OXU210HP_HCD=m
CONFIG_USB_ISP116X_HCD=m
CONFIG_USB_ISP1760_HCD=m
@@ -4666,8 +4739,8 @@ CONFIG_USB_EZUSB_FX2=m
#
# USB Physical Layer drivers
#
-CONFIG_OMAP_USB2=m
CONFIG_USB_ISP1301=m
+CONFIG_USB_RCAR_PHY=m
CONFIG_USB_ATM=m
CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_CXACRU=m
@@ -4709,8 +4782,6 @@ CONFIG_USB_FUNCTIONFS=m
CONFIG_USB_FUNCTIONFS_ETH=y
CONFIG_USB_FUNCTIONFS_RNDIS=y
CONFIG_USB_FUNCTIONFS_GENERIC=y
-CONFIG_USB_FILE_STORAGE=m
-# CONFIG_USB_FILE_STORAGE_TEST is not set
# CONFIG_USB_MASS_STORAGE is not set
CONFIG_USB_GADGET_TARGET=m
CONFIG_USB_G_SERIAL=m
@@ -4756,6 +4827,7 @@ CONFIG_SDIO_UART=m
CONFIG_MMC_SDHCI=m
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_ACPI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_WBSD=m
CONFIG_MMC_TIFM_SD=m
@@ -4764,6 +4836,7 @@ CONFIG_MMC_CB710=m
CONFIG_MMC_VIA_SDMMC=m
CONFIG_MMC_VUB300=m
CONFIG_MMC_USHC=m
+CONFIG_MMC_REALTEK_PCI=m
CONFIG_MEMSTICK=m
# CONFIG_MEMSTICK_DEBUG is not set
@@ -4779,6 +4852,7 @@ CONFIG_MSPRO_BLOCK=m
CONFIG_MEMSTICK_TIFM_MS=m
CONFIG_MEMSTICK_JMICRON_38X=m
CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
@@ -4827,10 +4901,6 @@ CONFIG_ACCESSIBILITY=y
CONFIG_A11Y_BRAILLE_CONSOLE=y
# CONFIG_INFINIBAND is not set
CONFIG_EDAC=y
-
-#
-# Reporting subsystems
-#
CONFIG_EDAC_LEGACY_SYSFS=y
# CONFIG_EDAC_DEBUG is not set
CONFIG_EDAC_DECODE_MCE=m
@@ -4878,6 +4948,7 @@ CONFIG_RTC_DRV_RS5C372=m
CONFIG_RTC_DRV_ISL1208=m
CONFIG_RTC_DRV_ISL12022=m
CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8523=m
CONFIG_RTC_DRV_PCF8563=m
CONFIG_RTC_DRV_PCF8583=m
CONFIG_RTC_DRV_M41T80=m
@@ -4947,6 +5018,7 @@ CONFIG_UIO=m
CONFIG_UIO_CIF=m
CONFIG_UIO_PDRV=m
CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_DMEM_GENIRQ is not set
CONFIG_UIO_AEC=m
CONFIG_UIO_SERCOS3=m
CONFIG_UIO_PCI_GENERIC=m
@@ -4967,6 +5039,7 @@ CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
#
CONFIG_HYPERV=m
CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
CONFIG_STAGING=y
CONFIG_ET131X=m
CONFIG_SLICOSS=m
@@ -5042,10 +5115,8 @@ CONFIG_COMEDI_ADDI_APCI_1500=m
CONFIG_COMEDI_ADDI_APCI_1516=m
CONFIG_COMEDI_ADDI_APCI_1564=m
CONFIG_COMEDI_ADDI_APCI_16XX=m
-CONFIG_COMEDI_ADDI_APCI_2016=m
CONFIG_COMEDI_ADDI_APCI_2032=m
CONFIG_COMEDI_ADDI_APCI_2200=m
-CONFIG_COMEDI_ADDI_APCI_3001=m
CONFIG_COMEDI_ADDI_APCI_3120=m
CONFIG_COMEDI_ADDI_APCI_3501=m
CONFIG_COMEDI_ADDI_APCI_3XXX=m
@@ -5125,18 +5196,12 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m
CONFIG_RTLLIB_CRYPTO_WEP=m
CONFIG_RTL8192E=m
CONFIG_R8712U=m
-CONFIG_RTS_PSTOR=m
-# CONFIG_RTS_PSTOR_DEBUG is not set
CONFIG_RTS5139=m
# CONFIG_RTS5139_DEBUG is not set
# CONFIG_TRANZPORT is not set
CONFIG_IDE_PHISON=m
CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_DEBUG is not set
-# CONFIG_LINE6_USB_DUMP_CTRL is not set
-# CONFIG_LINE6_USB_DUMP_MIDI is not set
# CONFIG_LINE6_USB_DUMP_PCM is not set
-# CONFIG_LINE6_USB_RAW is not set
# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
CONFIG_USB_SERIAL_QUATECH2=m
CONFIG_VT6655=m
@@ -5211,11 +5276,7 @@ CONFIG_LIRC_ZILOG=m
# Android
#
# CONFIG_ANDROID is not set
-# CONFIG_PHONE is not set
CONFIG_USB_WPAN_HCD=m
-CONFIG_IPACK_BUS=m
-CONFIG_BOARD_TPCI200=m
-CONFIG_SERIAL_IPOCTAL=m
CONFIG_WIMAX_GDM72XX=m
CONFIG_WIMAX_GDM72XX_QOS=y
CONFIG_WIMAX_GDM72XX_K_MODE=y
@@ -5230,6 +5291,8 @@ CONFIG_SBYPASS=m
CONFIG_BPCTL=m
CONFIG_CED1401=m
CONFIG_DGRP=m
+CONFIG_SB105X=m
+CONFIG_FIREWIRE_SERIAL=m
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
@@ -5315,7 +5378,10 @@ CONFIG_EXTCON_ARIZONA=m
CONFIG_MEMORY=y
# CONFIG_IIO is not set
# CONFIG_VME_BUS is not set
-# CONFIG_PWM is not set
+CONFIG_PWM=y
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
#
# Firmware Drivers
@@ -5340,7 +5406,6 @@ CONFIG_DCACHE_WORD_ACCESS=y
# CONFIG_EXT3_FS is not set
CONFIG_EXT4_FS=m
CONFIG_EXT4_USE_FOR_EXT23=y
-CONFIG_EXT4_FS_XATTR=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
# CONFIG_EXT4_DEBUG is not set
@@ -5495,6 +5560,10 @@ CONFIG_UFS_FS=m
# CONFIG_UFS_DEBUG is not set
CONFIG_EXOFS_FS=m
# CONFIG_EXOFS_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_ORE=m
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_NFS_FS=m
@@ -5535,7 +5604,7 @@ CONFIG_CIFS_UPCALL=y
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
CONFIG_CIFS_ACL=y
-# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DEBUG is not set
CONFIG_CIFS_DFS_UPCALL=y
CONFIG_CIFS_SMB2=y
CONFIG_CIFS_FSCACHE=y
@@ -5758,7 +5827,6 @@ CONFIG_DEBUG_RODATA=y
# CONFIG_DEBUG_SET_MODULE_RONX is not set
# CONFIG_DEBUG_NX_TEST is not set
CONFIG_DOUBLEFAULT=y
-# CONFIG_DEBUG_TLBFLUSH is not set
# CONFIG_IOMMU_STRESS is not set
CONFIG_HAVE_MMIOTRACE_SUPPORT=y
# CONFIG_X86_DECODER_SELFTEST is not set
@@ -5901,6 +5969,7 @@ CONFIG_CRYPTO_ARC4=m
CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_BLOWFISH_COMMON=m
CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST_COMMON=m
CONFIG_CRYPTO_CAST5=m
CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_DES=m
@@ -5970,6 +6039,7 @@ CONFIG_GENERIC_FIND_FIRST_BIT=y
CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_IOMAP=y
CONFIG_GENERIC_IO=y
+CONFIG_PERCPU_RWSEM=y
CONFIG_CRC_CCITT=m
CONFIG_CRC16=m
CONFIG_CRC_T10DIF=m
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index eb2e5d7ef..dcf662c3c 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.7.6-1 Kernel Configuration
+# Linux/x86_64 3.8.0 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -75,7 +75,7 @@ CONFIG_AUDIT=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT_WATCH=y
CONFIG_AUDIT_TREE=y
-# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
+CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
CONFIG_HAVE_GENERIC_HARDIRQS=y
#
@@ -129,10 +129,16 @@ CONFIG_RCU_FANOUT_LEAF=16
CONFIG_RCU_FAST_NO_HZ=y
# CONFIG_TREE_RCU_TRACE is not set
# CONFIG_RCU_BOOST is not set
+CONFIG_RCU_NOCB_CPU=y
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=19
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
+CONFIG_ARCH_USES_NUMA_PROT_NONE=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_NUMA_BALANCING=y
CONFIG_CGROUPS=y
# CONFIG_CGROUP_DEBUG is not set
CONFIG_CGROUP_FREEZER=y
@@ -243,14 +249,13 @@ CONFIG_HAVE_CMPXCHG_LOCAL=y
CONFIG_HAVE_CMPXCHG_DOUBLE=y
CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
-CONFIG_GENERIC_KERNEL_THREAD=y
-CONFIG_GENERIC_KERNEL_EXECVE=y
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_RCU_USER_QS=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_GENERIC_SIGALTSTACK=y
#
# GCOV-based kernel profiling
@@ -347,10 +352,7 @@ CONFIG_NO_BOOTMEM=y
# CONFIG_MATOM is not set
CONFIG_GENERIC_CPU=y
CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_CMPXCHG=y
CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_XADD=y
-CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_TSC=y
CONFIG_X86_CMPXCHG64=y
CONFIG_X86_CMOV=y
@@ -419,11 +421,13 @@ CONFIG_HAVE_MEMBLOCK=y
CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
CONFIG_ARCH_DISCARD_MEMBLOCK=y
CONFIG_MEMORY_ISOLATION=y
+# CONFIG_MOVABLE_NODE is not set
CONFIG_MEMORY_HOTPLUG=y
CONFIG_MEMORY_HOTPLUG_SPARSE=y
CONFIG_MEMORY_HOTREMOVE=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_BALLOON_COMPACTION=y
CONFIG_COMPACTION=y
CONFIG_MIGRATION=y
CONFIG_PHYS_ADDR_T_64BIT=y
@@ -470,6 +474,8 @@ CONFIG_PHYSICAL_START=0x1000000
CONFIG_RELOCATABLE=y
CONFIG_PHYSICAL_ALIGN=0x1000000
CONFIG_HOTPLUG_CPU=y
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
# CONFIG_COMPAT_VDSO is not set
# CONFIG_CMDLINE_BOOL is not set
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -511,6 +517,7 @@ CONFIG_ACPI_BUTTON=m
CONFIG_ACPI_VIDEO=m
CONFIG_ACPI_FAN=m
CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_I2C=m
CONFIG_ACPI_PROCESSOR=m
CONFIG_ACPI_IPMI=m
CONFIG_ACPI_HOTPLUG_CPU=y
@@ -518,6 +525,7 @@ CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
CONFIG_ACPI_THERMAL=m
CONFIG_ACPI_NUMA=y
# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
CONFIG_ACPI_BLACKLIST_YEAR=0
# CONFIG_ACPI_DEBUG is not set
CONFIG_ACPI_PCI_SLOT=m
@@ -541,6 +549,7 @@ CONFIG_SFI=y
#
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
CONFIG_CPU_FREQ_STAT=m
CONFIG_CPU_FREQ_STAT_DETAILS=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
@@ -568,6 +577,7 @@ CONFIG_X86_P4_CLOCKMOD=m
#
CONFIG_X86_SPEEDSTEP_LIB=m
CONFIG_CPU_IDLE=y
+# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y
# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
@@ -1047,9 +1057,11 @@ CONFIG_IP_SCTP=m
CONFIG_NET_SCTPPROBE=m
# CONFIG_SCTP_DBG_MSG is not set
# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-CONFIG_SCTP_HMAC_SHA1=y
-# CONFIG_SCTP_HMAC_MD5 is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
# CONFIG_RDS is not set
# CONFIG_TIPC is not set
CONFIG_ATM=m
@@ -1067,7 +1079,11 @@ CONFIG_L2TP_ETH=m
CONFIG_STP=m
CONFIG_BRIDGE=m
CONFIG_BRIDGE_IGMP_SNOOPING=y
-# CONFIG_NET_DSA is not set
+CONFIG_HAVE_NET_DSA=y
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_DSA=y
+CONFIG_NET_DSA_TAG_EDSA=y
+CONFIG_NET_DSA_TAG_TRAILER=y
CONFIG_VLAN_8021Q=m
# CONFIG_VLAN_8021Q_GVRP is not set
# CONFIG_DECNET is not set
@@ -1148,6 +1164,7 @@ CONFIG_NET_SCH_FIFO=y
CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m
CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_OPENVSWITCH=m
CONFIG_RPS=y
@@ -1355,13 +1372,13 @@ CONFIG_SYS_HYPERVISOR=y
# CONFIG_GENERIC_CPU_DEVICES is not set
CONFIG_REGMAP=y
CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_MMIO=m
CONFIG_REGMAP_IRQ=y
CONFIG_DMA_SHARED_BUFFER=y
#
# Bus devices
#
-CONFIG_OMAP_OCP2SCP=m
CONFIG_CONNECTOR=y
CONFIG_PROC_EVENTS=y
CONFIG_MTD=m
@@ -1683,6 +1700,9 @@ CONFIG_MEGARAID_SAS=m
CONFIG_SCSI_MPT2SAS=m
CONFIG_SCSI_MPT2SAS_MAX_SGE=128
# CONFIG_SCSI_MPT2SAS_LOGGING is not set
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_LOGGING=y
CONFIG_SCSI_UFSHCD=m
CONFIG_SCSI_HPTIOP=m
CONFIG_SCSI_BUSLOGIC=m
@@ -1730,6 +1750,7 @@ CONFIG_SCSI_PM8001=m
CONFIG_SCSI_SRP=m
CONFIG_SCSI_BFA_FC=m
CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
CONFIG_SCSI_LOWLEVEL_PCMCIA=y
CONFIG_PCMCIA_AHA152X=m
CONFIG_PCMCIA_FDOMAIN=m
@@ -1975,6 +1996,15 @@ CONFIG_CAIF_TTY=m
CONFIG_CAIF_SPI_SLAVE=m
CONFIG_CAIF_SPI_SYNC=y
CONFIG_CAIF_HSI=m
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
+CONFIG_NET_DSA_MV88E6131=m
+CONFIG_NET_DSA_MV88E6123_61_65=m
CONFIG_ETHERNET=y
CONFIG_MDIO=m
CONFIG_NET_VENDOR_3COM=y
@@ -1996,6 +2026,9 @@ CONFIG_ATL2=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=m
+CONFIG_NET_CADENCE=y
+CONFIG_ARM_AT91_ETHER=m
+CONFIG_MACB=m
CONFIG_NET_VENDOR_BROADCOM=y
CONFIG_B44=m
CONFIG_B44_PCI_AUTOSELECT=y
@@ -2052,19 +2085,18 @@ CONFIG_E1000=m
CONFIG_E1000E=m
CONFIG_IGB=m
CONFIG_IGB_DCA=y
-CONFIG_IGB_PTP=y
CONFIG_IGBVF=m
CONFIG_IXGB=m
CONFIG_IXGBE=m
CONFIG_IXGBE_HWMON=y
CONFIG_IXGBE_DCA=y
-CONFIG_IXGBE_PTP=y
CONFIG_IXGBEVF=m
CONFIG_NET_VENDOR_I825XX=y
CONFIG_ZNET=m
CONFIG_IP1000=m
CONFIG_JME=m
CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
CONFIG_SKGE=m
# CONFIG_SKGE_DEBUG is not set
CONFIG_SKGE_GENESIS=y
@@ -2093,7 +2125,6 @@ CONFIG_NET_VENDOR_NVIDIA=y
CONFIG_FORCEDETH=m
CONFIG_NET_VENDOR_OKI=y
CONFIG_PCH_GBE=m
-CONFIG_PCH_PTP=y
CONFIG_ETHOC=m
CONFIG_NET_PACKET_ENGINE=y
CONFIG_HAMACHI=m
@@ -2125,7 +2156,6 @@ CONFIG_SFC=m
CONFIG_SFC_MTD=y
CONFIG_SFC_MCDI_MON=y
CONFIG_SFC_SRIOV=y
-CONFIG_SFC_PTP=y
CONFIG_NET_VENDOR_SMSC=y
CONFIG_PCMCIA_SMC91C92=m
CONFIG_EPIC100=m
@@ -2216,6 +2246,7 @@ CONFIG_USB_NET_AX8817X=m
CONFIG_USB_NET_CDCETHER=m
CONFIG_USB_NET_CDC_EEM=m
CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
CONFIG_USB_NET_DM9601=m
CONFIG_USB_NET_SMSC75XX=m
CONFIG_USB_NET_SMSC95XX=m
@@ -2263,6 +2294,7 @@ CONFIG_ADM8211=m
# CONFIG_MAC80211_HWSIM is not set
CONFIG_MWL8K=m
CONFIG_ATH_COMMON=m
+CONFIG_ATH_CARDS=m
# CONFIG_ATH_DEBUG is not set
CONFIG_ATH5K=m
# CONFIG_ATH5K_DEBUG is not set
@@ -2286,6 +2318,9 @@ CONFIG_ATH6KL=m
CONFIG_ATH6KL_SDIO=m
CONFIG_ATH6KL_USB=m
# CONFIG_ATH6KL_DEBUG is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
CONFIG_B43=m
CONFIG_B43_BCMA=y
# CONFIG_B43_BCMA_EXTRA is not set
@@ -2319,7 +2354,7 @@ CONFIG_BRCMFMAC=m
CONFIG_BRCMFMAC_SDIO=y
# CONFIG_BRCMFMAC_SDIO_OOB is not set
CONFIG_BRCMFMAC_USB=y
-# CONFIG_BRCMISCAN is not set
+# CONFIG_BRCM_TRACING is not set
# CONFIG_BRCMDBG is not set
CONFIG_HOSTAP=m
CONFIG_HOSTAP_FIRMWARE=y
@@ -2338,7 +2373,6 @@ CONFIG_IWLDVM=m
# CONFIG_IWLWIFI_DEBUG is not set
CONFIG_IWLWIFI_DEVICE_TRACING=y
# CONFIG_IWLWIFI_P2P is not set
-# CONFIG_IWLWIFI_EXPERIMENTAL_MFP is not set
CONFIG_IWLEGACY=m
CONFIG_IWL4965=m
CONFIG_IWL3945=m
@@ -2394,6 +2428,7 @@ CONFIG_RT2X00_LIB_LEDS=y
CONFIG_RTL8192CE=m
CONFIG_RTL8192SE=m
CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
CONFIG_RTL8192CU=m
CONFIG_RTLWIFI=m
# CONFIG_RTLWIFI_DEBUG is not set
@@ -2602,7 +2637,6 @@ CONFIG_KEYBOARD_MPR121=m
# CONFIG_KEYBOARD_OPENCORES is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_OMAP4 is not set
# CONFIG_KEYBOARD_XTKBD is not set
CONFIG_INPUT_MOUSE=y
CONFIG_MOUSE_PS2=m
@@ -2687,6 +2721,7 @@ CONFIG_TOUCHSCREEN_PENMOUNT=m
CONFIG_TOUCHSCREEN_EDT_FT5X06=m
CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
CONFIG_TOUCHSCREEN_UCB1400=m
CONFIG_TOUCHSCREEN_PIXCIR=m
CONFIG_TOUCHSCREEN_WM97XX=m
@@ -2737,6 +2772,7 @@ CONFIG_INPUT_KXTJ9=m
CONFIG_INPUT_POWERMATE=m
CONFIG_INPUT_YEALINK=m
CONFIG_INPUT_CM109=m
+CONFIG_INPUT_RETU_PWRBUTTON=m
CONFIG_INPUT_UINPUT=m
CONFIG_INPUT_PCF50633_PMU=m
CONFIG_INPUT_PCF8574=m
@@ -2760,6 +2796,7 @@ CONFIG_SERIO_LIBPS2=y
CONFIG_SERIO_RAW=m
CONFIG_SERIO_ALTERA_PS2=m
CONFIG_SERIO_PS2MULT=m
+CONFIG_SERIO_ARC_PS2=m
CONFIG_GAMEPORT=m
CONFIG_GAMEPORT_NS558=m
CONFIG_GAMEPORT_L4=m
@@ -2823,7 +2860,8 @@ CONFIG_SERIAL_ALTERA_UART=m
CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
CONFIG_SERIAL_PCH_UART=m
-CONFIG_SERIAL_XILINX_PS_UART=m
+CONFIG_SERIAL_ARC=m
+CONFIG_SERIAL_ARC_NR_PORTS=1
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
CONFIG_PPDEV=m
@@ -2911,6 +2949,7 @@ CONFIG_I2C_SCMI=m
#
# I2C system bus drivers (mostly embedded / system-on-chip)
#
+# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_DESIGNWARE_CORE=m
CONFIG_I2C_DESIGNWARE_PCI=m
CONFIG_I2C_EG20T=m
@@ -2930,6 +2969,7 @@ CONFIG_I2C_PARPORT=m
CONFIG_I2C_PARPORT_LIGHT=m
CONFIG_I2C_TAOS_EVM=m
CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
#
# Other I2C/SMBus bus drivers
@@ -2967,6 +3007,7 @@ CONFIG_DP83640_PHY=m
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
CONFIG_GPIOLIB=y
+CONFIG_GPIO_ACPI=y
# CONFIG_DEBUG_GPIO is not set
CONFIG_GPIO_SYSFS=y
@@ -2975,6 +3016,7 @@ CONFIG_GPIO_SYSFS=y
#
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_TS5500 is not set
CONFIG_GPIO_SCH=m
CONFIG_GPIO_ICH=m
# CONFIG_GPIO_VX855 is not set
@@ -3012,6 +3054,11 @@ CONFIG_GPIO_UCB1400=y
#
# MODULbus GPIO expanders:
#
+
+#
+# USB GPIO expanders:
+#
+CONFIG_GPIO_VIPERBOARD=m
# CONFIG_W1 is not set
CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
@@ -3029,7 +3076,9 @@ CONFIG_TEST_POWER=m
# CONFIG_CHARGER_MAX8903 is not set
# CONFIG_CHARGER_LP8727 is not set
# CONFIG_CHARGER_GPIO is not set
+# CONFIG_CHARGER_BQ2415X is not set
# CONFIG_CHARGER_SMB347 is not set
+CONFIG_POWER_RESET=y
CONFIG_POWER_AVS=y
CONFIG_HWMON=y
CONFIG_HWMON_VID=m
@@ -3164,6 +3213,12 @@ CONFIG_SENSORS_ACPI_POWER=m
CONFIG_SENSORS_ATK0110=m
CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+CONFIG_FAIR_SHARE=y
+CONFIG_STEP_WISE=y
+# CONFIG_USER_SPACE is not set
# CONFIG_CPU_THERMAL is not set
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
@@ -3240,6 +3295,7 @@ CONFIG_SSB_SDIOHOST=y
# CONFIG_SSB_DEBUG is not set
CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_SSB_DRIVER_GPIO=y
CONFIG_BCMA_POSSIBLE=y
#
@@ -3250,6 +3306,7 @@ CONFIG_BCMA_BLOCKIO=y
CONFIG_BCMA_HOST_PCI_POSSIBLE=y
CONFIG_BCMA_HOST_PCI=y
CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
# CONFIG_BCMA_DEBUG is not set
#
@@ -3258,6 +3315,8 @@ CONFIG_BCMA_DRIVER_GMAC_CMN=y
CONFIG_MFD_CORE=y
CONFIG_MFD_SM501=m
CONFIG_MFD_SM501_GPIO=y
+CONFIG_MFD_RTSX_PCI=m
+CONFIG_MFD_TI_AM335X_TSCADC=m
CONFIG_HTC_PASIC3=m
CONFIG_UCB1400_CORE=m
CONFIG_MFD_LM3533=m
@@ -3285,6 +3344,8 @@ CONFIG_MFD_RDC321X=m
# CONFIG_MFD_JANZ_CMODIO is not set
CONFIG_MFD_VX855=m
CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_RETU=m
# CONFIG_REGULATOR is not set
CONFIG_MEDIA_SUPPORT=m
@@ -3602,10 +3663,16 @@ CONFIG_RADIO_WL128X=m
#
CONFIG_DVB_FIREDTV=m
CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
CONFIG_DVB_B2C2_FLEXCOP=m
CONFIG_VIDEO_SAA7146=m
CONFIG_VIDEO_SAA7146_VV=m
CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
#
@@ -4163,6 +4230,7 @@ CONFIG_SND_FIREWIRE=y
CONFIG_SND_FIREWIRE_LIB=m
CONFIG_SND_FIREWIRE_SPEAKERS=m
CONFIG_SND_ISIGHT=m
+CONFIG_SND_SCS1X=m
CONFIG_SND_PCMCIA=y
CONFIG_SND_VXPOCKET=m
CONFIG_SND_PDAUDIOCF=m
@@ -4203,6 +4271,7 @@ CONFIG_HID_KYE=m
CONFIG_HID_UCLOGIC=m
CONFIG_HID_WALTOP=m
CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
CONFIG_HID_TWINHAN=m
CONFIG_HID_KENSINGTON=m
CONFIG_HID_LCPOWER=m
@@ -4259,6 +4328,11 @@ CONFIG_HID_SENSOR_HUB=m
CONFIG_USB_HID=m
CONFIG_HID_PID=y
CONFIG_USB_HIDDEV=y
+
+#
+# I2C HID support
+#
+CONFIG_I2C_HID=m
CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB_ARCH_HAS_EHCI=y
CONFIG_USB_ARCH_HAS_XHCI=y
@@ -4290,6 +4364,7 @@ CONFIG_USB_XHCI_HCD=m
CONFIG_USB_EHCI_HCD=m
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=m
CONFIG_USB_OXU210HP_HCD=m
CONFIG_USB_ISP116X_HCD=m
CONFIG_USB_ISP1760_HCD=m
@@ -4462,8 +4537,8 @@ CONFIG_USB_EZUSB_FX2=m
#
# USB Physical Layer drivers
#
-CONFIG_OMAP_USB2=m
CONFIG_USB_ISP1301=m
+CONFIG_USB_RCAR_PHY=m
CONFIG_USB_ATM=m
CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_CXACRU=m
@@ -4504,8 +4579,6 @@ CONFIG_USB_FUNCTIONFS=m
CONFIG_USB_FUNCTIONFS_ETH=y
CONFIG_USB_FUNCTIONFS_RNDIS=y
CONFIG_USB_FUNCTIONFS_GENERIC=y
-CONFIG_USB_FILE_STORAGE=m
-# CONFIG_USB_FILE_STORAGE_TEST is not set
# CONFIG_USB_MASS_STORAGE is not set
CONFIG_USB_GADGET_TARGET=m
CONFIG_USB_G_SERIAL=m
@@ -4551,6 +4624,7 @@ CONFIG_SDIO_UART=m
CONFIG_MMC_SDHCI=m
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_ACPI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_WBSD=m
CONFIG_MMC_TIFM_SD=m
@@ -4559,6 +4633,7 @@ CONFIG_MMC_CB710=m
CONFIG_MMC_VIA_SDMMC=m
CONFIG_MMC_VUB300=m
CONFIG_MMC_USHC=m
+CONFIG_MMC_REALTEK_PCI=m
CONFIG_MEMSTICK=m
# CONFIG_MEMSTICK_DEBUG is not set
@@ -4574,6 +4649,7 @@ CONFIG_MSPRO_BLOCK=m
CONFIG_MEMSTICK_TIFM_MS=m
CONFIG_MEMSTICK_JMICRON_38X=m
CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
@@ -4622,10 +4698,6 @@ CONFIG_ACCESSIBILITY=y
CONFIG_A11Y_BRAILLE_CONSOLE=y
# CONFIG_INFINIBAND is not set
CONFIG_EDAC=y
-
-#
-# Reporting subsystems
-#
CONFIG_EDAC_LEGACY_SYSFS=y
# CONFIG_EDAC_DEBUG is not set
CONFIG_EDAC_DECODE_MCE=m
@@ -4671,6 +4743,7 @@ CONFIG_RTC_DRV_RS5C372=m
CONFIG_RTC_DRV_ISL1208=m
CONFIG_RTC_DRV_ISL12022=m
CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8523=m
CONFIG_RTC_DRV_PCF8563=m
CONFIG_RTC_DRV_PCF8583=m
CONFIG_RTC_DRV_M41T80=m
@@ -4739,6 +4812,7 @@ CONFIG_UIO=m
CONFIG_UIO_CIF=m
CONFIG_UIO_PDRV=m
CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_DMEM_GENIRQ is not set
CONFIG_UIO_AEC=m
CONFIG_UIO_SERCOS3=m
CONFIG_UIO_PCI_GENERIC=m
@@ -4759,6 +4833,7 @@ CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
#
CONFIG_HYPERV=m
CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
#
# Xen driver support
@@ -4781,6 +4856,7 @@ CONFIG_XEN_PCIDEV_BACKEND=m
CONFIG_XEN_PRIVCMD=m
CONFIG_XEN_ACPI_PROCESSOR=m
# CONFIG_XEN_MCE_LOG is not set
+CONFIG_XEN_HAVE_PVMMU=y
CONFIG_STAGING=y
CONFIG_ET131X=m
CONFIG_SLICOSS=m
@@ -4810,10 +4886,8 @@ CONFIG_COMEDI_ADDI_APCI_1500=m
CONFIG_COMEDI_ADDI_APCI_1516=m
CONFIG_COMEDI_ADDI_APCI_1564=m
CONFIG_COMEDI_ADDI_APCI_16XX=m
-CONFIG_COMEDI_ADDI_APCI_2016=m
CONFIG_COMEDI_ADDI_APCI_2032=m
CONFIG_COMEDI_ADDI_APCI_2200=m
-CONFIG_COMEDI_ADDI_APCI_3001=m
CONFIG_COMEDI_ADDI_APCI_3120=m
CONFIG_COMEDI_ADDI_APCI_3501=m
CONFIG_COMEDI_ADDI_APCI_3XXX=m
@@ -4892,18 +4966,12 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m
CONFIG_RTLLIB_CRYPTO_WEP=m
CONFIG_RTL8192E=m
CONFIG_R8712U=m
-CONFIG_RTS_PSTOR=m
-# CONFIG_RTS_PSTOR_DEBUG is not set
CONFIG_RTS5139=m
# CONFIG_RTS5139_DEBUG is not set
# CONFIG_TRANZPORT is not set
CONFIG_IDE_PHISON=m
CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_DEBUG is not set
-# CONFIG_LINE6_USB_DUMP_CTRL is not set
-# CONFIG_LINE6_USB_DUMP_MIDI is not set
# CONFIG_LINE6_USB_DUMP_PCM is not set
-# CONFIG_LINE6_USB_RAW is not set
# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
CONFIG_USB_SERIAL_QUATECH2=m
CONFIG_VT6655=m
@@ -4978,11 +5046,7 @@ CONFIG_LIRC_ZILOG=m
# Android
#
# CONFIG_ANDROID is not set
-# CONFIG_PHONE is not set
CONFIG_USB_WPAN_HCD=m
-CONFIG_IPACK_BUS=m
-CONFIG_BOARD_TPCI200=m
-CONFIG_SERIAL_IPOCTAL=m
CONFIG_WIMAX_GDM72XX=m
CONFIG_WIMAX_GDM72XX_QOS=y
CONFIG_WIMAX_GDM72XX_K_MODE=y
@@ -4998,6 +5062,8 @@ CONFIG_SBYPASS=m
CONFIG_BPCTL=m
CONFIG_CED1401=m
CONFIG_DGRP=m
+CONFIG_SB105X=m
+CONFIG_FIREWIRE_SERIAL=m
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
@@ -5084,6 +5150,9 @@ CONFIG_MEMORY=y
# CONFIG_IIO is not set
# CONFIG_VME_BUS is not set
# CONFIG_PWM is not set
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
#
# Firmware Drivers
@@ -5108,7 +5177,6 @@ CONFIG_DCACHE_WORD_ACCESS=y
# CONFIG_EXT3_FS is not set
CONFIG_EXT4_FS=m
CONFIG_EXT4_USE_FOR_EXT23=y
-CONFIG_EXT4_FS_XATTR=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
# CONFIG_EXT4_DEBUG is not set
@@ -5264,6 +5332,10 @@ CONFIG_UFS_FS=m
# CONFIG_UFS_DEBUG is not set
CONFIG_EXOFS_FS=m
# CONFIG_EXOFS_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_ORE=m
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_NFS_FS=m
@@ -5304,7 +5376,7 @@ CONFIG_CIFS_UPCALL=y
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
CONFIG_CIFS_ACL=y
-# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DEBUG is not set
CONFIG_CIFS_DFS_UPCALL=y
CONFIG_CIFS_SMB2=y
CONFIG_CIFS_FSCACHE=y
@@ -5595,7 +5667,7 @@ CONFIG_CRYPTO_AEAD=m
CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_BLKCIPHER=m
CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_HASH2=y
CONFIG_CRYPTO_RNG=m
CONFIG_CRYPTO_RNG2=y
@@ -5644,6 +5716,7 @@ CONFIG_CRYPTO_VMAC=m
# Digest
#
CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CRC32C_X86_64=y
CONFIG_CRYPTO_CRC32C_INTEL=m
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_MD4=m
@@ -5674,6 +5747,8 @@ CONFIG_CRYPTO_BLOWFISH_COMMON=m
CONFIG_CRYPTO_BLOWFISH_X86_64=m
CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_CAMELLIA_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
+CONFIG_CRYPTO_CAST_COMMON=m
CONFIG_CRYPTO_CAST5=m
CONFIG_CRYPTO_CAST5_AVX_X86_64=m
CONFIG_CRYPTO_CAST6=m
@@ -5744,6 +5819,7 @@ CONFIG_GENERIC_FIND_FIRST_BIT=y
CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_IOMAP=y
CONFIG_GENERIC_IO=y
+CONFIG_PERCPU_RWSEM=y
CONFIG_CRC_CCITT=m
CONFIG_CRC16=m
CONFIG_CRC_T10DIF=m
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index d96235100..c94a54bcc 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=
-KERNEL_VERSION=3.7.9-1-LIBRE
+KERNEL_VERSION=3.8.0-1-LIBRE
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 63097f460..a6d06ae5f 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 178373 2013-02-21 00:45:43Z foutrelis $
# Maintainer: Paul Mattal <paul@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,24 +6,24 @@ _pkgbase=lirc
pkgbase=lirc-libre
pkgname=('lirc-libre' 'lirc-utils-libre')
pkgver=0.9.0
-pkgrel=37
+pkgrel=38
epoch=1
-_extramodules=extramodules-3.7-LIBRE
+_extramodules=extramodules-3.8-LIBRE
arch=('i686' 'x86_64' 'mips64el')
url="http://www.lirc.org/"
license=('GPL')
### NOTICE don't forget to bump version in depends in package_lirc
-makedepends=('help2man' 'linux-libre-headers>=3.7' 'linux-libre-headers<3.8' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
+makedepends=('help2man' 'linux-libre-headers>=3.8' 'linux-libre-headers<3.9' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
options=('!makeflags' '!strip')
source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2
lirc_wpc8769l.patch
lircd-handle-large-config.patch
lirc_atiusb-kfifo.patch
kernel-2.6.39.patch
- lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd
- lirc.service lircm.service irexec.service
- lirc.tmpfiles
- )
+ linux-3.8.patch
+ lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd
+ lirc.service lircm.service irexec.service
+ lirc.tmpfiles)
build() {
_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
@@ -32,6 +32,7 @@ build() {
patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch"
patch -Np1 -i "${srcdir}/lirc_atiusb-kfifo.patch"
patch -Np1 -i "${srcdir}/kernel-2.6.39.patch"
+ patch -Np1 -i "${srcdir}/linux-3.8.patch"
sed -i '/AC_PATH_XTRA/d' configure.ac
sed -e 's/@X_CFLAGS@//g' \
@@ -57,7 +58,7 @@ build() {
}
package_lirc-libre() {
- pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (built for the linux-libre kernel package) "
+ pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (built for the linux-libre kernel package)"
depends=('lirc-utils-libre' 'linux-libre>=3.7' 'linux-libre<3.8')
replaces=('lirc' 'lirc+pctv')
conflicts=('lirc')
@@ -114,6 +115,7 @@ md5sums=('b232aef26f23fe33ea8305d276637086'
'b70cc9640505205446ec47b7d4779f38'
'1f8b104a2365d9f93404b143f499059b'
'087a7d102e1c96bf1179f38db2b0b237'
+ '9ee196bd03ea44af5a752fb0cc6ca96a'
'8d0e238dc0eda95e340fe570605da492'
'85f7fdac55e5256967241864049bf5e9'
'3deb02604b37811d41816e9b4385fcc3'
diff --git a/libre/lirc-libre/linux-3.8.patch b/libre/lirc-libre/linux-3.8.patch
new file mode 100644
index 000000000..7b6378a83
--- /dev/null
+++ b/libre/lirc-libre/linux-3.8.patch
@@ -0,0 +1,80 @@
+diff -upr lirc-0.9.0.orig/drivers/lirc_serial/lirc_serial.c lirc-0.9.0/drivers/lirc_serial/lirc_serial.c
+--- lirc-0.9.0.orig/drivers/lirc_serial/lirc_serial.c 2013-02-21 02:36:25.000000000 +0200
++++ lirc-0.9.0/drivers/lirc_serial/lirc_serial.c 2013-02-21 02:39:55.000000000 +0200
+@@ -1103,12 +1103,12 @@ static struct lirc_driver driver = {
+
+ static struct platform_device *lirc_serial_dev;
+
+-static int __devinit lirc_serial_probe(struct platform_device *dev)
++static int lirc_serial_probe(struct platform_device *dev)
+ {
+ return 0;
+ }
+
+-static int __devexit lirc_serial_remove(struct platform_device *dev)
++static int lirc_serial_remove(struct platform_device *dev)
+ {
+ return 0;
+ }
+@@ -1159,7 +1159,7 @@ static int lirc_serial_resume(struct pla
+
+ static struct platform_driver lirc_serial_driver = {
+ .probe = lirc_serial_probe,
+- .remove = __devexit_p(lirc_serial_remove),
++ .remove = lirc_serial_remove,
+ .suspend = lirc_serial_suspend,
+ .resume = lirc_serial_resume,
+ .driver = {
+diff -upr lirc-0.9.0.orig/drivers/lirc_sir/lirc_sir.c lirc-0.9.0/drivers/lirc_sir/lirc_sir.c
+--- lirc-0.9.0.orig/drivers/lirc_sir/lirc_sir.c 2013-02-21 02:36:25.000000000 +0200
++++ lirc-0.9.0/drivers/lirc_sir/lirc_sir.c 2013-02-21 02:38:24.000000000 +0200
+@@ -1290,19 +1290,19 @@ static int init_lirc_sir(void)
+ return 0;
+ }
+
+-static int __devinit lirc_sir_probe(struct platform_device *dev)
++static int lirc_sir_probe(struct platform_device *dev)
+ {
+ return 0;
+ }
+
+-static int __devexit lirc_sir_remove(struct platform_device *dev)
++static int lirc_sir_remove(struct platform_device *dev)
+ {
+ return 0;
+ }
+
+ static struct platform_driver lirc_sir_driver = {
+ .probe = lirc_sir_probe,
+- .remove = __devexit_p(lirc_sir_remove),
++ .remove = lirc_sir_remove,
+ .driver = {
+ .name = "lirc_sir",
+ .owner = THIS_MODULE,
+diff -upr lirc-0.9.0.orig/drivers/lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c
+--- lirc-0.9.0.orig/drivers/lirc_wpc8769l/lirc_wpc8769l.c 2013-02-21 02:36:25.000000000 +0200
++++ lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c 2013-02-21 02:39:39.000000000 +0200
+@@ -930,12 +930,12 @@ static int wpc8769l_acpi_detect(void)
+ #ifdef MODULE
+ static struct platform_device *lirc_wpc8769l_platform_dev;
+
+-static int __devinit lirc_wpc8769l_probe(struct platform_device *dev)
++static int lirc_wpc8769l_probe(struct platform_device *dev)
+ {
+ return 0;
+ }
+
+-static int __devexit lirc_wpc8769l_remove(struct platform_device *dev)
++static int lirc_wpc8769l_remove(struct platform_device *dev)
+ {
+ return 0;
+ }
+@@ -963,7 +963,7 @@ static int lirc_wpc8769l_resume(struct p
+
+ static struct platform_driver lirc_wpc8769l_platform_driver = {
+ .probe = lirc_wpc8769l_probe,
+- .remove = __devexit_p(lirc_wpc8769l_remove),
++ .remove = lirc_wpc8769l_remove,
+ .suspend = lirc_wpc8769l_suspend,
+ .resume = lirc_wpc8769l_resume,
+ .driver = {
diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install
index a6694836f..49a9dc601 100644
--- a/libre/lirc-libre/lirc.install
+++ b/libre/lirc-libre/lirc.install
@@ -1,4 +1,4 @@
-EXTRAMODULES=extramodules-3.7-LIBRE
+EXTRAMODULES=extramodules-3.8-LIBRE
post_install() {
# updating module dependencies
diff --git a/libre/luxblend25/PKGBUILD b/libre/luxblend25/PKGBUILD
index 26640795f..6d249b329 100644
--- a/libre/luxblend25/PKGBUILD
+++ b/libre/luxblend25/PKGBUILD
@@ -4,7 +4,7 @@
pkgbase=luxrender
pkgname=luxblend25
srcver=3a928b723b29
-pkgver=1.1.v2.65
+pkgver=1.1.v2.66
_pkgver=${pkgver::3}
reqname=blender
reqver=${pkgver:5}
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 86e933e40..188f92b37 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -1,3 +1,4 @@
+# $Id$
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: xduugu
# Contributor: nh2
@@ -11,13 +12,13 @@
_pkgname=tp_smapi
pkgname=tp_smapi-libre
pkgver=0.41
-pkgrel=14
+pkgrel=15
pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)"
arch=('i686' 'x86_64' 'mips64el')
url='https://github.com/evgeni/tp_smapi'
license=('GPL')
-depends=('linux-libre>=3.7' 'linux-libre<3.8')
-makedepends=('linux-libre-headers>=3.7' 'linux-libre-headers<3.8')
+depends=('linux-libre>=3.8' 'linux-libre<3.9')
+makedepends=('linux-libre-headers>=3.8' 'linux-libre-headers<3.9')
replaces=("${_pkgname}")
conflicts=("${_pkgname}")
provides=("${_pkgname}=${pkgver}")
@@ -51,13 +52,13 @@ package() {
mv "${_kernver}/extra" "${_extramodules##*/}"
rmdir "${_kernver}"
- # compress kernel libre modules
+ # compress kernel modules
find "${pkgdir}" -name "*.ko" -exec gzip -9 {} +
# load module on startup
echo tp_smapi > "${srcdir}/${_pkgname}.conf"
install -Dm644 "${srcdir}/${_pkgname}.conf" "${pkgdir}/usr/lib/modules-load.d/${_pkgname}.conf"
- # update kernel libre version in install file
+ # update kernel version in install file
sed -ri "s#^(extramodules=).*\$#\1${_extramodules}#" "${startdir}/${_pkgname}.install"
}
diff --git a/libre/tp_smapi-libre/tp_smapi.install b/libre/tp_smapi-libre/tp_smapi.install
index 3e1c13750..5474faf8e 100644
--- a/libre/tp_smapi-libre/tp_smapi.install
+++ b/libre/tp_smapi-libre/tp_smapi.install
@@ -1,4 +1,4 @@
-extramodules=/usr/lib/modules/extramodules-3.7-ARCH
+extramodules=/usr/lib/modules/extramodules-3.8-LIBRE
post_install() {
depmod -v $(< "$extramodules/version") &>/dev/null
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index a9e23cc0a..ced6d2085 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -7,17 +7,17 @@
_pkgname=vhba-module
pkgname=vhba-module-libre
pkgver=20120422
-_extramodules=extramodules-3.7-LIBRE
-pkgrel=17
+_extramodules=extramodules-3.8-LIBRE
+pkgrel=18
pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)"
arch=('i686' 'x86_64' 'mips64el')
url="http://cdemu.sourceforge.net/"
license=('GPL')
-depends=('linux-libre>=3.7' 'linux-libre<3.8')
+depends=('linux-libre>=3.8' 'linux-libre<3.9')
makedepends=('linux-libre-headers')
options=(!makeflags)
install=$_pkgname.install
-replaces=('vhba-module')
+replaces=('vhba-module')
conflicts=('vhba-module')
provides=("vhba-module=$pkgver")
source=("http://downloads.sourceforge.net/cdemu/$_pkgname-$pkgver.tar.bz2"
diff --git a/libre/vhba-module-libre/vhba-module.install b/libre/vhba-module-libre/vhba-module.install
index 9f376f541..3e26e5438 100644
--- a/libre/vhba-module-libre/vhba-module.install
+++ b/libre/vhba-module-libre/vhba-module.install
@@ -1,6 +1,6 @@
_updatemod() {
echo " > Updating module dependencies..."
- EXTRAMODULES='extramodules-3.7-LIBRE'
+ EXTRAMODULES='extramodules-3.8-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index 329ee26c4..b78d365db 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -7,7 +7,8 @@
pkgbase=virtualbox-libre-modules
pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
pkgver=4.2.6
-pkgrel=6
+_extramodules=extramodules-3.8-LIBRE
+pkgrel=7
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL')
@@ -18,7 +19,7 @@ makedepends=('linux-libre-headers'
'bc')
build() {
- _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
# dkms need modification to be run as user
cp -r /var/lib/dkms .
@@ -32,42 +33,38 @@ build() {
}
package_virtualbox-libre-host-modules(){
- _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
- _extraver=extramodules-${_kernver%.*}-LIBRE
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre kernel package)'
-# depends=("linux-libre>=${_kernver%.*}" "linux-libre<$(echo "${_kernver%.*}+0.1"|bc)")
depends=('linux-libre>=3.7' 'linux-libre<3.8')
provides=("virtualbox-host-modules=${pkgver}")
replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
install=virtualbox-libre-host-modules.install
- install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
+ install -dm755 "$pkgdir/usr/lib/modules/$_extramodules"
cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
- install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
+ install -m644 * "$pkgdir/usr/lib/modules/$_extramodules"
find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
- sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-host-modules.install"
+ sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" "$startdir/virtualbox-libre-host-modules.install"
}
package_virtualbox-libre-guest-modules(){
- _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
- _extraver=extramodules-${_kernver%.*}-LIBRE
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre kernel package)'
license=('GPL')
-# depends=("linux-libre>=${_kernver%.*}" "linux-libre<$(echo "${_kernver%.*}+0.1"|bc)")
depends=('linux-libre>=3.7' 'linux-libre<3.8')
provides=("virtualbox-guest-modules=${pkgver}")
replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
install=virtualbox-libre-guest-modules.install
- install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
+ install -dm755 "$pkgdir/usr/lib/modules/$_extramodules"
cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
- install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
+ install -m644 * "$pkgdir/usr/lib/modules/$_extramodules"
find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
- sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-guest-modules.install"
+ sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" "$startdir/virtualbox-libre-guest-modules.install"
}
# vim:set ts=2 sw=2 et:
diff --git a/libre/virtualbox-libre/003-linux-3.8.patch b/libre/virtualbox-libre/003-linux-3.8.patch
new file mode 100644
index 000000000..0c6d9fbbf
--- /dev/null
+++ b/libre/virtualbox-libre/003-linux-3.8.patch
@@ -0,0 +1,15 @@
+--- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c (revision 43343)
++++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c (revision 44317)
+@@ -196,7 +196,11 @@
+
+
+ /** PCI hotplug structure. */
+-static const struct pci_device_id __devinitdata g_VBoxGuestPciId[] =
++static const struct pci_device_id
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
++__devinitdata
++#endif
++g_VBoxGuestPciId[] =
+ {
+ {
+ vendor: VMMDEV_VENDORID,
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index dc94a2a33..dc9e21490 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=('virtualbox-libre'
'virtualbox-libre-sdk'
'virtualbox-libre-guest-utils')
pkgver=4.2.6
-pkgrel=1.1
+pkgrel=3
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -49,14 +49,11 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
'10-vboxdrv.rules'
'60-vboxguest.rules'
'LocalConfig.kmk'
- 'vboxservice.conf'
- 'vboxservice.rc'
'vboxservice.service'
- 'vboxweb.conf'
- 'vboxweb.rc'
'vboxweb.service'
'001-vboxdrv-reference.patch'
'002-change_default_driver_dir.patch'
+ '003-linux-3.8.patch'
'os_blag_64.png'
'os_blag.png'
'os_dragora_64.png'
@@ -81,14 +78,11 @@ md5sums=('d680aeb3b4379b8281527aeb012b2df5'
'5f85710e0b8606de967716ded7b2d351'
'ed1341881437455d9735875ddf455fbe'
'58d6e5bb4b4c1c6f3f0b3daa6aaeed03'
- '3c08ad30b89add47d3f45121200a5360'
- '7d9823507206de9b8528a72af2f18d74'
'07c5f6d86c4b7839d719c8ee0c53653b'
- '7e9483b1069a54f181546083ac7e5469'
- 'c159d683ba1947290fc2ad2c64194150'
'bc9efed88e0469cd7fc460d5a5cd7b4b'
'f4e4c7895ede9c524109589bf16ae660'
'97e193f050574dd272a38e5ee5ebe62b'
+ 'e565ff0d028776d4f48e6e5b4d0b48e0'
'8538dba8686d7449cb481c9bae9d722a'
'545c925b46f2ac95e5f8ae407fad101a'
'f6416f509c2e5460e4dc624e0a57f3c1'
@@ -166,7 +160,7 @@ build() {
}
package_virtualbox-libre() {
- pkgdesc='Powerful x86 virtualization for enterprise as well as home use (with free GNU/Linux distros presets and Oracle VM VirtualBox Extension Pack support removed)'
+ pkgdesc='Powerful x86 virtualization for enterprise as well as home use (with free GNU/Linux distros presets included and Oracle VM VirtualBox Extension Pack support removed)'
depends=('curl'
'libpng'
'libxcursor'
@@ -181,7 +175,7 @@ package_virtualbox-libre() {
'virtualbox-libre-sdk: Developer kit'
'virtualbox-libre-host-dkms: Host kernel source modules for non-stock kernels'
'net-tools: Host-only or bridged networking support')
- backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxweb')
+ backup=('etc/vbox/vbox.cfg')
replaces=('virtualbox' 'virtualbox-ose')
conflicts=('virtualbox' 'virtualbox-ose')
provides=("virtualbox=$pkgver")
@@ -247,14 +241,9 @@ package_virtualbox-libre() {
install -D -m 0644 "$srcdir/10-vboxdrv.rules" \
"$pkgdir/usr/lib/udev/rules.d/10-vboxdrv.rules"
- # install rc.d script
- install -D -m755 "$srcdir/vboxweb.rc" "$pkgdir/etc/rc.d/vboxweb"
# install systemd service
install -D -m644 "$srcdir/vboxweb.service" \
"$pkgdir/usr/lib/systemd/system/vboxweb.service"
- # install sample config
- install -D -m644 "$srcdir/vboxweb.conf" "$pkgdir/etc/conf.d/vboxweb"
-
}
package_virtualbox-libre-sdk() {
@@ -313,11 +302,10 @@ package_virtualbox-libre-guest-dkms() {
package_virtualbox-libre-guest-utils(){
pkgdesc='VirtualBox Guest userspace utilities'
depends=('virtualbox-libre-guest-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
- optdepends=('virtualbox-guest-source: Guest kernel source modules for non-stock kernels')
+ optdepends=('virtualbox-libre-guest-dkms: Guest kernel source modules for non-stock kernels')
provides=("virtualbox-guest-utils=$pkgver")
replaces=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions')
conflicts=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions')
- backup=('etc/conf.d/vboxservice')
install=virtualbox-libre-guest-utils.install
source "VirtualBox-$pkgver/env.sh"
@@ -339,10 +327,6 @@ package_virtualbox-libre-guest-utils(){
# install udev rules
install -D -m 0644 60-vboxguest.rules \
"$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
- # install rc.d script
- install -D -m755 vboxservice.rc "$pkgdir/etc/rc.d/vboxservice"
- # install sample config
- install -D -m644 vboxservice.conf "$pkgdir/etc/conf.d/vboxservice"
# install systemd service file
install -D -m644 vboxservice.service \
"$pkgdir/usr/lib/systemd/system/vboxservice.service"
diff --git a/libre/virtualbox-libre/vboxservice.conf b/libre/virtualbox-libre/vboxservice.conf
deleted file mode 100644
index 9d4ec629f..000000000
--- a/libre/virtualbox-libre/vboxservice.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# VBoxService -h
-VBOX_SERVICE_OPTION=""
diff --git a/libre/virtualbox-libre/vboxservice.rc b/libre/virtualbox-libre/vboxservice.rc
deleted file mode 100644
index 5a62d69a3..000000000
--- a/libre/virtualbox-libre/vboxservice.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/${0##*/}
-
-name=VBoxService
-PID=$(pidof -o %PPID $name)
-
-case "$1" in
- start)
- stat_busy 'Starting VirtualBox Guest Service'
- [[ -z "$PID" ]] && ${name} $VBOX_SERVICE_OPTION &>/dev/null \
- && { add_daemon ${0##*/}; stat_done; } \
- || { stat_fail; exit 1; }
- ;;
- stop)
- stat_busy 'Stopping VirtualBox Guest Service'
- [[ -n "$PID" ]] && kill $PID &>/dev/null \
- && { rm_daemon ${0##*/}; stat_done; } \
- || { stat_fail; exit 1; }
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- status)
- stat_busy 'Checking VirtualBox Guest Service status'
- ck_status ${0##*/}
- ;;
- *)
- echo "usage: ${0##*/} {start|stop|restart|status}" >&2
- exit 1
-esac
-
-exit 0
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/vboxweb.conf b/libre/virtualbox-libre/vboxweb.conf
deleted file mode 100644
index c36f6a143..000000000
--- a/libre/virtualbox-libre/vboxweb.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# WebService Mandatory Variables
-#VBOXWEB_USER=
-
-# WebService Variables
-#VBOXWEB_LOGFILE=
-#VBOXWEB_HOST=
-#VBOXWEB_PORT=
-#VBOXWEB_TIMEOUT=
-#VBOXWEB_CHECK_INTERVAL=
-#VBOXWEB_THREADS=
-#VBOXWEB_KEEPALIVE=
diff --git a/libre/virtualbox-libre/vboxweb.rc b/libre/virtualbox-libre/vboxweb.rc
deleted file mode 100644
index 97273e3c7..000000000
--- a/libre/virtualbox-libre/vboxweb.rc
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/vbox/vbox.cfg
-. /etc/conf.d/vboxweb
-
-BINARY="$INSTALL_DIR/vboxwebsrv"
-
-start() {
- stat_busy "Starting VirtualBox Web Service";
- if ! pidof -o %PPID $BINARY >/dev/null; then
- [[ "$VBOXWEB_USER" ]] || stat_die
- lsmod | grep -q "vboxdrv[^_-]" || stat_die
- PARAMS="--background"
- [[ "$VBOXWEB_HOST" ]] && PARAMS+=" -H $VBOXWEB_HOST"
- [[ "$VBOXWEB_PORT" ]] && PARAMS+=" -p $VBOXWEB_PORT"
- [[ "$VBOXWEB_TIMEOUT" ]] && PARAMS+=" -t $VBOXWEB_TIMEOUT"
- [[ "$VBOXWEB_CHECK_INTERVAL" ]] && PARAMS+=" -i $VBOXWEB_CHECK_INTERVAL"
- [[ "$VBOXWEB_THREADS" ]] && PARAMS+=" -T $VBOXWEB_THREADS"
- [[ "$VBOXWEB_KEEPALIVE" ]] && PARAMS+=" -k $VBOXWEB_KEEPALIVE"
- [[ "$VBOXWEB_LOGFILE" ]] && PARAMS+=" -F $VBOXWEB_LOGFILE"
- # prevent inheriting this setting to VBoxSVC
- unset VBOX_RELEASE_LOG_DEST
- su - $VBOXWEB_USER -c "$BINARY $PARAMS" &>/dev/null
- # ugly: wait until the final process has forked
- sleep .2
- if pidof -o %PPID $BINARY >/dev/null; then
- add_daemon vboxweb
- stat_done
- else
- stat_die
- fi
- else
- stat_die
- fi
-}
-
-stop() {
- stat_busy "Stopping VirtualBox Web Service"
- PID=$(pidof -o %PPID $BINARY)
- [[ $PID ]] && kill $PID &>/dev/null
- if ! pidof -o %PPID $BINARY >/dev/null; then
- rm_daemon vboxweb
- stat_done
- else
- stat_die
- fi
-}
-
-restart() {
- stop && start
-}
-
-status() {
- stat_busy "Checking for VirtualBox Web Service"
- if pidof -o %PPID $BINARY >/dev/null; then
- stat_done
- else
- stat_fail
- false
- fi
-}
-
-case "$1" in
-start)
- start
- ;;
-stop)
- stop
- ;;
-restart)
- restart
- ;;
-force-reload)
- restart
- ;;
-status)
- status
- ;;
-*)
- echo "Usage: $0 {start|stop|restart|status}"
- exit 1
-esac
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install
index 2d62eae43..067c5b35e 100644
--- a/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install
+++ b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install
@@ -4,8 +4,8 @@
post_install() {
dkms add vboxguest/${1%-*}
cat << EOF
-==> To build and install your modules run dkms install vboxguest/${1%-*}
-==> To do this automatically at startup you can add dkms in your DAEMONS
+==> To build and install your modules run: dkms install vboxguest/${1%-*}
+==> To do this automatically at startup run: systemctl enable dkms.service
EOF
}
diff --git a/libre/virtualbox-libre/virtualbox-libre-host-dkms.install b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install
index 8028cb7e0..8bc316e49 100644
--- a/libre/virtualbox-libre/virtualbox-libre-host-dkms.install
+++ b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install
@@ -4,8 +4,8 @@
post_install() {
dkms add vboxhost/${1%-*}
cat << EOF
-==> To build and install your modules run dkms install vboxhost/${1%-*}
-==> To do this automatically at startup you can add dkms in your DAEMONS
+==> To build and install your modules run: dkms install vboxhost/${1%-*}
+==> To do this automatically at startup run: systemctl enable dkms.service
EOF
}
diff --git a/libre/virtualbox-libre/virtualbox-libre.install b/libre/virtualbox-libre/virtualbox-libre.install
index 90d8a8739..ad4f70f76 100644
--- a/libre/virtualbox-libre/virtualbox-libre.install
+++ b/libre/virtualbox-libre/virtualbox-libre.install
@@ -28,12 +28,6 @@ post_install() {
# arg 2: the old package version
post_upgrade() {
post_install "$1"
- if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then
- cat << EOF
-===> Starting with virtualbox-libre version 4.1.6-1, kernel modules handling is done by virtualbox-libre-host-modules.
-===> Use virtualbox-libre-host-dkms package if you don't use our stock linux-libre package.
-EOF
- fi
}
# arg 1: the old package version
diff --git a/artistic/aqsis/PKGBUILD b/pcr/aqsis/PKGBUILD
index 5a772503f..5a772503f 100644
--- a/artistic/aqsis/PKGBUILD
+++ b/pcr/aqsis/PKGBUILD
diff --git a/artistic/aqsis/aqsis.install b/pcr/aqsis/aqsis.install
index b2086e07b..b2086e07b 100644
--- a/artistic/aqsis/aqsis.install
+++ b/pcr/aqsis/aqsis.install
diff --git a/artistic/cinepaint-lts/LICENSE b/pcr/cinepaint-lts/LICENSE
index 746207229..746207229 100644
--- a/artistic/cinepaint-lts/LICENSE
+++ b/pcr/cinepaint-lts/LICENSE
diff --git a/artistic/cinepaint-lts/PKGBUILD b/pcr/cinepaint-lts/PKGBUILD
index c680ac904..c680ac904 100644
--- a/artistic/cinepaint-lts/PKGBUILD
+++ b/pcr/cinepaint-lts/PKGBUILD
diff --git a/artistic/cinepaint-lts/cinepaint-libpng15.patch b/pcr/cinepaint-lts/cinepaint-libpng15.patch
index 619d9af42..619d9af42 100644
--- a/artistic/cinepaint-lts/cinepaint-libpng15.patch
+++ b/pcr/cinepaint-lts/cinepaint-libpng15.patch
diff --git a/artistic/cinepaint-lts/cinepaint.install b/pcr/cinepaint-lts/cinepaint.install
index 5e5cfef4d..5e5cfef4d 100644
--- a/artistic/cinepaint-lts/cinepaint.install
+++ b/pcr/cinepaint-lts/cinepaint.install
diff --git a/artistic/gimp-art/PKGBUILD b/pcr/gimp-art/PKGBUILD
index 11c3b191b..11c3b191b 100644
--- a/artistic/gimp-art/PKGBUILD
+++ b/pcr/gimp-art/PKGBUILD
diff --git a/artistic/gimp-art/gimp-splash-artwork.license b/pcr/gimp-art/gimp-splash-artwork.license
index 64267a6c0..64267a6c0 100644
--- a/artistic/gimp-art/gimp-splash-artwork.license
+++ b/pcr/gimp-art/gimp-splash-artwork.license
diff --git a/artistic/gimp-art/gimp-splash-artwork.png b/pcr/gimp-art/gimp-splash-artwork.png
index 76c9e8c94..76c9e8c94 100644
--- a/artistic/gimp-art/gimp-splash-artwork.png
+++ b/pcr/gimp-art/gimp-splash-artwork.png
Binary files differ
diff --git a/artistic/gimp-art/gimp.install b/pcr/gimp-art/gimp.install
index c317fbaca..c317fbaca 100644
--- a/artistic/gimp-art/gimp.install
+++ b/pcr/gimp-art/gimp.install
diff --git a/artistic/libspnav/Makefile.in.diff b/pcr/libspnav/Makefile.in.diff
index 4c93b9cb6..4c93b9cb6 100644
--- a/artistic/libspnav/Makefile.in.diff
+++ b/pcr/libspnav/Makefile.in.diff
diff --git a/artistic/libspnav/PKGBUILD b/pcr/libspnav/PKGBUILD
index da0272ed7..da0272ed7 100644
--- a/artistic/libspnav/PKGBUILD
+++ b/pcr/libspnav/PKGBUILD
diff --git a/artistic/spacenavd/PKGBUILD b/pcr/spacenavd/PKGBUILD
index cf8a43c32..cf8a43c32 100644
--- a/artistic/spacenavd/PKGBUILD
+++ b/pcr/spacenavd/PKGBUILD
diff --git a/artistic/spacenavd/spacenav.service b/pcr/spacenavd/spacenav.service
index 30e8019e9..30e8019e9 100644
--- a/artistic/spacenavd/spacenav.service
+++ b/pcr/spacenavd/spacenav.service
diff --git a/artistic/spacenavd/spacenavd b/pcr/spacenavd/spacenavd
index 61946197c..61946197c 100644
--- a/artistic/spacenavd/spacenavd
+++ b/pcr/spacenavd/spacenavd
diff --git a/artistic/spnavcfg/PKGBUILD b/pcr/spnavcfg/PKGBUILD
index cbea06d01..cbea06d01 100644
--- a/artistic/spnavcfg/PKGBUILD
+++ b/pcr/spnavcfg/PKGBUILD
diff --git a/artistic/yafaray-git/PKGBUILD b/pcr/yafaray-git/PKGBUILD
index 0c5d4f6e4..0c5d4f6e4 100644
--- a/artistic/yafaray-git/PKGBUILD
+++ b/pcr/yafaray-git/PKGBUILD
diff --git a/artistic/yafaray-git/gcc47.patch b/pcr/yafaray-git/gcc47.patch
index 75775498b..75775498b 100644
--- a/artistic/yafaray-git/gcc47.patch
+++ b/pcr/yafaray-git/gcc47.patch