Fri Mar 8 00:04:03 PST 2013

20 files changed, 186 insertions, 836 deletions

diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 94e5b00cb..a721f66f9 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -1,33 +1,28 @@
 # $Id$
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
-spacenav=false
-pkgbase=blender-libre
-pkgflag=-libre
-if [ $spacenav == true ]; then
-  pkgname=(
-    blender-spacenav-libre
-  )
-  spndesc=' (with spacenav support)'
+_spacenav=false
+_pkgname=blender-libre
+_pkgflag=libre
+if [ $_spacenav == true ]; then
+  pkgname=blender-spacenav-libre
+  _spndesc=' (with spacenav support)'
 else
-  pkgname=(
-    blender-libre
-  )
-  spndesc=''
+  pkgname=blender-libre
+  _spndesc=''
 fi
-pkgdesc="Fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support$spndesc"
-pkgver=2.66
+epoch=7
+pkgver=2.66a
+_pyver=3.3
 pkgrel=2
-pkgaev=6
+pkgdesc="Fully integrated 3D graphics creation suite, without nonfree povray, cuda and redcode support$_spndesc"
 arch=(
   i686
   x86_64
   mips64el
 )
-license=(
-  GPL
-)
-url="http://www.${pkgbase%$pkgflag}.org"
+license=GPL
+url="http://www.${_pkgname%-$_pkgflag}.org"
 depends=(
   desktop-file-utils
   ffmpeg
@@ -45,41 +40,29 @@ depends=(
   shared-mime-info
   xdg-utils
 )
-if [ $spacenav == true ]; then
+if [ $_spacenav == true ]; then
   depends+=(
-    # dependencies tree of binaries software (root) #
     libspnav
   )
 fi
-optdepends=(
-  'bullet: for Physics Simulation in BGE'
-)
+optdepends='bullet: for Rigid Bodies and Physics Simulation'
 makedepends=(
-  # make dependencies tree (root) #
   boost
   cmake
   mesa
   subversion
 )
 provides=(
-  ${pkgbase%$pkgflag}=$pkgaev:$pkgver
-)
-conflicts=(
-  ${pkgbase%$pkgflag}
-)
-replaces=(
-  ${pkgbase%$pkgflag}
-)
-install=$pkgbase.install
-source=(
-  "http://download.${pkgbase%$pkgflag}.org/source/${pkgbase%$pkgflag}-$pkgver.tar.gz"
-)
-sha512sums=(
-  f76499edc5f8179a42ec6d6334c6fa03f830570d054061ae40c2e8e1ec0a0090efcbb642f4f7f3b99d3941d4c4b791a0e357a275acf1b3ac251d58906f23b2b4
+  ${_pkgname%-$_pkgflag}=$epoch:$pkgver
 )
+conflicts=${_pkgname%-$_pkgflag}
+replaces=${_pkgname%-$_pkgflag}
+install=$_pkgname.install
+source="http://download.${_pkgname%-$_pkgflag}.org/source/${_pkgname%-$_pkgflag}-$pkgver.tar.gz"
+sha512sums=ea5def031daa220991f6165950234b311e8ae3baa6785d6226efefa90b64e1b83e8635f71f9a7fc7ae23923ce313d5ae48ffa0c54cf7ff794a4fb2dacbe8714f
 
 build() {
-  cd $srcdir/${pkgbase%$pkgflag}-$pkgver
+  cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver
 
   mkdir build
   cd build
@@ -90,10 +73,10 @@ build() {
     -DCMAKE_BUILD_TYPE=Release\
     -DCMAKE_INSTALL_PREFIX=/usr\
     -DOPENIMAGEIO_ROOT_DIR=/usr\
-    -DPYTHON_INCLUDE_DIRS=/usr/include/python3.3m\
+    -DPYTHON_INCLUDE_DIRS=/usr/include/python${_pyver}m\
     -DPYTHON_LIBPATH=/usr/lib\
-    -DPYTHON_LIBRARY=python3.3m\
-    -DPYTHON_VERSION=3.3\
+    -DPYTHON_LIBRARY=python${_pyver}m\
+    -DPYTHON_VERSION=${_pyver}\
     $DSUPPORT_SSE2_BUILD\
     -DWITH_CODEC_FFMPEG=ON\
     -DWITH_CODEC_SNDFILE=ON\
@@ -110,12 +93,17 @@ build() {
     -DWITH_PLAYER=ON\
     -DWITH_PYTHON_INSTALL=OFF\
     -DWITH_SYSTEM_GLEW=ON
+
   setarch $CARCH make $MAKEFLAGS
   setarch $CARCH make
 }
 
 package() {
-  cd $srcdir/${pkgbase%$pkgflag}-$pkgver/build
+  cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build
   setarch $CARCH make DESTDIR=$pkgdir install
-  setarch $CARCH python -m compileall $pkgdir/usr/share/${pkgbase%$pkgflag}
+  setarch $CARCH python -m compileall $pkgdir/usr/share/${_pkgname%-$_pkgflag}
+  # drop nonfree povray render support
+  rm -vrf $pkgdir/usr/share/${_pkgname%-$_pkgflag}/${pkgver::4}/scripts/addons/render_povray
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/blender-libre/blender.install b/libre/blender-libre/blender.install
deleted file mode 100644
index 724bfce00..000000000
--- a/libre/blender-libre/blender.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/libre/blender-libre/boost-1.50.patch b/libre/blender-libre/boost-1.50.patch
deleted file mode 100644
index fa698a3a6..000000000
--- a/libre/blender-libre/boost-1.50.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur a/intern/cycles/util/util_cache.cpp b/intern/cycles/util/util_cache.cpp
---- a/intern/cycles/util/util_cache.cpp	2012-05-10 11:44:09.000000000 -0300
-+++ b/intern/cycles/util/util_cache.cpp	2012-07-15 14:19:34.893238929 -0300
-@@ -26,8 +26,6 @@
- #include "util_path.h"
- #include "util_types.h"
- 
--#define BOOST_FILESYSTEM_VERSION 2
--
- #include <boost/filesystem.hpp> 
- #include <boost/algorithm/string.hpp>
- 
-@@ -117,7 +115,7 @@
- 		boost::filesystem::directory_iterator it(dir), it_end;
- 
- 		for(; it != it_end; it++) {
--			string filename = it->path().filename();
-+			string filename = it->path().filename().string();
- 
- 			if(boost::starts_with(filename, name))
- 				if(except.find(filename) == except.end())
-diff -Naur blender-2.63a/intern/cycles/util/util_path.cpp blender-2.63a-new/intern/cycles/util/util_path.cpp
---- a/intern/cycles/util/util_path.cpp	2012-05-10 11:44:09.000000000 -0300
-+++ b/intern/cycles/util/util_path.cpp	2012-07-15 14:19:14.126293394 -0300
-@@ -26,8 +26,6 @@
- 
- #include <stdio.h>
- 
--#define BOOST_FILESYSTEM_VERSION 2
--
- #include <boost/filesystem.hpp> 
- #include <boost/algorithm/string.hpp>
- 
-@@ -60,7 +58,7 @@
- 
- string path_filename(const string& path)
- {
--	return boost::filesystem::path(path).filename();
-+	return boost::filesystem::path(path).filename().string();
- }
- 
- string path_dirname(const string& path)
diff --git a/libre/blender-libre/ffmpeg-0.11.patch b/libre/blender-libre/ffmpeg-0.11.patch
deleted file mode 100644
index 45144140c..000000000
--- a/libre/blender-libre/ffmpeg-0.11.patch
+++ /dev/null
@@ -1,434 +0,0 @@
-diff -Naur blender-2.63a.orig/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp blender-2.63a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
---- blender-2.63a.orig/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp	2012-05-10 11:45:40.000000000 -0300
-+++ blender-2.63a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp	2012-07-10 18:12:55.727129720 -0300
-@@ -143,23 +143,23 @@
- 
- 	switch(m_codecCtx->sample_fmt)
- 	{
--	case SAMPLE_FMT_U8:
-+	case AV_SAMPLE_FMT_U8:
- 		m_convert = AUD_convert_u8_float;
- 		m_specs.format = AUD_FORMAT_U8;
- 		break;
--	case SAMPLE_FMT_S16:
-+	case AV_SAMPLE_FMT_S16:
- 		m_convert = AUD_convert_s16_float;
- 		m_specs.format = AUD_FORMAT_S16;
- 		break;
--	case SAMPLE_FMT_S32:
-+	case AV_SAMPLE_FMT_S32:
- 		m_convert = AUD_convert_s32_float;
- 		m_specs.format = AUD_FORMAT_S32;
- 		break;
--	case SAMPLE_FMT_FLT:
-+	case AV_SAMPLE_FMT_FLT:
- 		m_convert = AUD_convert_copy<float>;
- 		m_specs.format = AUD_FORMAT_FLOAT32;
- 		break;
--	case SAMPLE_FMT_DBL:
-+	case AV_SAMPLE_FMT_DBL:
- 		m_convert = AUD_convert_double_float;
- 		m_specs.format = AUD_FORMAT_FLOAT64;
- 		break;
-@@ -189,7 +189,7 @@
- 	}
- 	catch(AUD_Exception&)
- 	{
--		av_close_input_file(m_formatCtx);
-+		avformat_close_input(&m_formatCtx);
- 		throw;
- 	}
- }
-@@ -227,7 +227,7 @@
- 	}
- 	catch(AUD_Exception&)
- 	{
--		av_close_input_stream(m_formatCtx);
-+		avformat_close_input(&m_formatCtx);
- 		av_free(m_aviocontext);
- 		throw;
- 	}
-@@ -239,7 +239,7 @@
- 
- 	if(m_aviocontext)
- 	{
--		av_close_input_stream(m_formatCtx);
-+		avformat_close_input(&m_formatCtx);
- 		av_free(m_aviocontext);
- 	}
- 	else
-diff -Naur blender-2.63a.orig/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp blender-2.63a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
---- blender-2.63a.orig/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp	2012-05-10 11:45:40.000000000 -0300
-+++ blender-2.63a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp	2012-07-10 18:14:55.893790273 -0300
-@@ -133,23 +133,23 @@
- 		{
- 		case AUD_FORMAT_U8:
- 			m_convert = AUD_convert_float_u8;
--			m_codecCtx->sample_fmt = SAMPLE_FMT_U8;
-+			m_codecCtx->sample_fmt = AV_SAMPLE_FMT_U8;
- 			break;
- 		case AUD_FORMAT_S16:
- 			m_convert = AUD_convert_float_s16;
--			m_codecCtx->sample_fmt = SAMPLE_FMT_S16;
-+			m_codecCtx->sample_fmt = AV_SAMPLE_FMT_S16;
- 			break;
- 		case AUD_FORMAT_S32:
- 			m_convert = AUD_convert_float_s32;
--			m_codecCtx->sample_fmt = SAMPLE_FMT_S32;
-+			m_codecCtx->sample_fmt = AV_SAMPLE_FMT_S32;
- 			break;
- 		case AUD_FORMAT_FLOAT32:
- 			m_convert = AUD_convert_copy<float>;
--			m_codecCtx->sample_fmt = SAMPLE_FMT_FLT;
-+			m_codecCtx->sample_fmt = AV_SAMPLE_FMT_FLT;
- 			break;
- 		case AUD_FORMAT_FLOAT64:
- 			m_convert = AUD_convert_float_double;
--			m_codecCtx->sample_fmt = SAMPLE_FMT_DBL;
-+			m_codecCtx->sample_fmt = AV_SAMPLE_FMT_DBL;
- 			break;
- 		default:
- 			AUD_THROW(AUD_ERROR_FFMPEG, format_error);
-diff -Naur blender-2.63a.orig/intern/ffmpeg/ffmpeg_compat.h blender-2.63a/intern/ffmpeg/ffmpeg_compat.h
---- blender-2.63a.orig/intern/ffmpeg/ffmpeg_compat.h	2012-05-10 11:46:17.000000000 -0300
-+++ blender-2.63a/intern/ffmpeg/ffmpeg_compat.h	2012-07-10 18:17:04.823783714 -0300
-@@ -76,6 +76,10 @@
- #define FFMPEG_FFV1_ALPHA_SUPPORTED
- #endif
- 
-+#if ((LIBAVFORMAT_VERSION_MAJOR < 53) || ((LIBAVFORMAT_VERSION_MAJOR == 53) && (LIBAVFORMAT_VERSION_MINOR < 24)) || ((LIBAVFORMAT_VERSION_MAJOR == 53) && (LIBAVFORMAT_VERSION_MINOR < 24) && (LIBAVFORMAT_VERSION_MICRO < 2)))
-+#define avformat_close_input(x) av_close_input_file(*(x))
-+#endif
-+
- #ifndef FFMPEG_HAVE_AVIO
- #define AVIO_FLAG_WRITE URL_WRONLY
- #define avio_open url_fopen
-diff -Naur blender-2.63a.orig/source/blender/blenkernel/intern/writeffmpeg.c blender-2.63a/source/blender/blenkernel/intern/writeffmpeg.c
---- blender-2.63a.orig/source/blender/blenkernel/intern/writeffmpeg.c	2012-05-10 11:50:20.000000000 -0300
-+++ blender-2.63a/source/blender/blenkernel/intern/writeffmpeg.c	2012-07-10 18:27:00.213753426 -0300
-@@ -36,6 +36,7 @@
- #include <libavformat/avformat.h>
- #include <libavcodec/avcodec.h>
- #include <libavutil/rational.h>
-+#include <libavutil/samplefmt.h>
- #include <libswscale/swscale.h>
- #include <libavcodec/opt.h>
- 
-@@ -612,7 +613,7 @@
- 
- 	c->sample_rate = rd->ffcodecdata.audio_mixrate;
- 	c->bit_rate = ffmpeg_audio_bitrate*1000;
--	c->sample_fmt = SAMPLE_FMT_S16;
-+	c->sample_fmt = AV_SAMPLE_FMT_S16;
- 	c->channels = rd->ffcodecdata.audio_channels;
- 	codec = avcodec_find_encoder(c->codec_id);
- 	if (!codec) {
-@@ -654,11 +655,21 @@
- }
- /* essential functions -- start, append, end */
- 
-+static void ffmpeg_dict_set_int(AVDictionary **dict, const char *key, int value)
-+{
-+	char buffer[32];
-+
-+	BLI_snprintf(buffer, sizeof(buffer), "%d", value);
-+
-+	av_dict_set(dict, key, buffer, 0);
-+}
-+
- static int start_ffmpeg_impl(struct RenderData *rd, int rectx, int recty, ReportList *reports)
- {
- 	/* Handle to the output file */
- 	AVFormatContext* of;
- 	AVOutputFormat* fmt;
-+	AVDictionary *opts = NULL;
- 	char name[256];
- 	const char ** exts;
- 
-@@ -704,13 +715,14 @@
- 	of->oformat = fmt;
- 	of->packet_size= rd->ffcodecdata.mux_packet_size;
- 	if (ffmpeg_audio_codec != CODEC_ID_NONE) {
--		of->mux_rate = rd->ffcodecdata.mux_rate;
-+		ffmpeg_dict_set_int(&opts, "muxrate", rd->ffcodecdata.mux_rate);
- 	}
- 	else {
--		of->mux_rate = 0;
-+		av_dict_set(&opts, "muxrate", "0", 0);
- 	}
- 
--	of->preload = (int)(0.5*AV_TIME_BASE);
-+	ffmpeg_dict_set_int(&opts, "preload", (int)(0.5*AV_TIME_BASE));
-+
- 	of->max_delay = (int)(0.7*AV_TIME_BASE);
- 
- 	fmt->audio_codec = ffmpeg_audio_codec;
-@@ -773,6 +785,7 @@
- 		fmt->audio_codec = CODEC_ID_PCM_S16LE;
- 		if (ffmpeg_audio_codec != CODEC_ID_NONE && rd->ffcodecdata.audio_mixrate != 48000 && rd->ffcodecdata.audio_channels != 2) {
- 			BKE_report(reports, RPT_ERROR, "FFMPEG only supports 48khz / stereo audio for DV!");
-+			av_dict_free(&opts);
- 			return 0;
- 		}
- 	}
-@@ -782,6 +795,7 @@
- 		printf("alloc video stream %p\n", video_stream);
- 		if (!video_stream) {
- 			BKE_report(reports, RPT_ERROR, "Error initializing video stream.");
-+			av_dict_free(&opts);
- 			return 0;
- 		}
- 	}
-@@ -790,27 +804,27 @@
- 		audio_stream = alloc_audio_stream(rd, fmt->audio_codec, of);
- 		if (!audio_stream) {
- 			BKE_report(reports, RPT_ERROR, "Error initializing audio stream.");
-+			av_dict_free(&opts);
- 			return 0;
- 		}
- 	}
--	if (av_set_parameters(of, NULL) < 0) {
--		BKE_report(reports, RPT_ERROR, "Error setting output parameters.");
--		return 0;
--	}
- 	if (!(fmt->flags & AVFMT_NOFILE)) {
- 		if (avio_open(&of->pb, name, AVIO_FLAG_WRITE) < 0) {
- 			BKE_report(reports, RPT_ERROR, "Could not open file for writing.");
-+			av_dict_free(&opts);
- 			return 0;
- 		}
- 	}
- 
--	if (av_write_header(of) < 0) {
-+	if (avformat_write_header(of, NULL) < 0) {
- 		BKE_report(reports, RPT_ERROR, "Could not initialize streams. Probably unsupported codec combination.");
-+		av_dict_free(&opts);
- 		return 0;
- 	}
- 
- 	outfile = of;
- 	av_dump_format(of, 0, name, 1);
-+	av_dict_free(&opts);
- 
- 	return 1;
- }
-diff -Naur blender-2.63a.orig/source/blender/imbuf/intern/anim_movie.c blender-2.63a/source/blender/imbuf/intern/anim_movie.c
---- blender-2.63a.orig/source/blender/imbuf/intern/anim_movie.c	2012-05-10 11:50:59.000000000 -0300
-+++ blender-2.63a/source/blender/imbuf/intern/anim_movie.c	2012-07-10 18:30:19.413743294 -0300
-@@ -436,7 +436,7 @@
- 	int            i, videoStream;
- 
- 	AVCodec *pCodec;
--	AVFormatContext *pFormatCtx;
-+	AVFormatContext *pFormatCtx = NULL;
- 	AVCodecContext *pCodecCtx;
- 	int frs_num;
- 	double frs_den;
-@@ -455,7 +455,7 @@
- 
- 	do_init_ffmpeg();
- 
--	if (av_open_input_file(&pFormatCtx, anim->name, NULL, 0, NULL)!=0) {
-+	if (avformat_open_input(&pFormatCtx, anim->name, NULL, NULL)!=0) {
- 		return -1;
- 	}
- 
-@@ -990,7 +990,8 @@
- 				ret = av_seek_frame(anim->pFormatCtx, 
- 						    -1,
- 						    pos, AVSEEK_FLAG_BYTE);
--				av_update_cur_dts(anim->pFormatCtx, v_st, dts);
-+				// XXX: need double verification
-+				// av_update_cur_dts(anim->pFormatCtx, v_st, dts);
- 			}
- 			else {
- 				av_log(anim->pFormatCtx, AV_LOG_DEBUG, 
-diff -Naur blender-2.63a.orig/source/blender/imbuf/intern/indexer.c blender-2.63a/source/blender/imbuf/intern/indexer.c
---- blender-2.63a.orig/source/blender/imbuf/intern/indexer.c	2012-05-10 11:50:59.000000000 -0300
-+++ blender-2.63a/source/blender/imbuf/intern/indexer.c	2012-07-10 18:38:25.737051891 -0300
-@@ -533,13 +533,6 @@
- 		rv->c->flags |= CODEC_FLAG_GLOBAL_HEADER;
- 	}
- 
--	if (av_set_parameters(rv->of, NULL) < 0) {
--		fprintf(stderr, "Couldn't set output parameters? "
--			"Proxy not built!\n");
--		av_free(rv->of);
--		return 0;
--	}
--
- 	if (avio_open(&rv->of->pb, fname, AVIO_FLAG_WRITE) < 0) {
- 		fprintf(stderr, "Couldn't open outputfile! "
- 			"Proxy not built!\n");
-@@ -576,7 +569,12 @@
- 			NULL, NULL, NULL);
- 	}
- 
--	av_write_header(rv->of);
-+	if (avformat_write_header(rv->of, NULL) < 0) {
-+		fprintf(stderr, "Couldn't set output parameters? "
-+		        "Proxy not built!\n");
-+		av_free(rv->of);
-+		return 0;
-+	}
- 
- 	return rv;
- }
-@@ -739,7 +737,7 @@
- 	memset(context->proxy_ctx, 0, sizeof(context->proxy_ctx));
- 	memset(context->indexer, 0, sizeof(context->indexer));
- 
--	if (av_open_input_file(&context->iFormatCtx, anim->name, NULL, 0, NULL) != 0) {
-+	if (avformat_open_input(&context->iFormatCtx, anim->name, NULL, NULL) != 0) {
- 		MEM_freeN(context);
- 		return NULL;
- 	}
-diff -Naur blender-2.63a.orig/source/blender/imbuf/intern/util.c blender-2.63a/source/blender/imbuf/intern/util.c
---- blender-2.63a.orig/source/blender/imbuf/intern/util.c	2012-05-10 11:50:59.000000000 -0300
-+++ blender-2.63a/source/blender/imbuf/intern/util.c	2012-07-10 18:40:49.950377886 -0300
-@@ -243,7 +243,7 @@
- 
- static int isffmpeg (const char *filename)
- {
--	AVFormatContext *pFormatCtx;
-+	AVFormatContext *pFormatCtx = NULL;
- 	unsigned int i;
- 	int videoStream;
- 	AVCodec *pCodec;
-@@ -261,7 +261,7 @@
- 		BLI_testextensie(filename, ".cin") ||
- 		BLI_testextensie(filename, ".wav")) return 0;
- 
--	if (av_open_input_file(&pFormatCtx, filename, NULL, 0, NULL)!=0) {
-+	if (avformat_open_input(&pFormatCtx, filename, NULL, NULL)!=0) {
- 		if (UTIL_DEBUG) fprintf(stderr, "isffmpeg: av_open_input_file failed\n");
- 		return 0;
- 	}
-diff -Naur blender-2.63a.orig/source/gameengine/VideoTexture/VideoFFmpeg.cpp blender-2.63a/source/gameengine/VideoTexture/VideoFFmpeg.cpp
---- blender-2.63a.orig/source/gameengine/VideoTexture/VideoFFmpeg.cpp	2012-05-10 11:48:50.000000000 -0300
-+++ blender-2.63a/source/gameengine/VideoTexture/VideoFFmpeg.cpp	2012-07-10 18:56:03.696998071 -0300
-@@ -162,14 +162,14 @@
- }
- 
- 
--int VideoFFmpeg::openStream(const char *filename, AVInputFormat *inputFormat, AVFormatParameters *formatParams)
-+int VideoFFmpeg::openStream(const char *filename, AVInputFormat *inputFormat, AVDictionary **formatParams)
- {
--	AVFormatContext *formatCtx;
-+	AVFormatContext *formatCtx = NULL;
- 	int				i, videoStream;
- 	AVCodec			*codec;
- 	AVCodecContext	*codecCtx;
- 
--	if (av_open_input_file(&formatCtx, filename, inputFormat, 0, formatParams)!=0)
-+	if (avformat_open_input(&formatCtx, filename, inputFormat, formatParams)!=0)
- 		return -1;
- 
- 	if (av_find_stream_info(formatCtx)<0) 
-@@ -545,11 +545,7 @@
- 		// but it is really not desirable to seek on http file, so force streaming.
- 		// It would be good to find this information from the context but there are no simple indication
- 		!strncmp(filename, "http://", 7) ||
--#ifdef FFMPEG_PB_IS_POINTER
--		(m_formatCtx->pb && m_formatCtx->pb->is_streamed)
--#else
--		m_formatCtx->pb.is_streamed
--#endif
-+		(m_formatCtx->pb && !m_formatCtx->pb->seekable)
- 		)
- 	{
- 		// the file is in fact a streaming source, treat as cam to prevent seeking
-@@ -586,13 +582,11 @@
- {
- 	// open camera source
- 	AVInputFormat		*inputFormat;
--	AVFormatParameters	formatParams;
--	AVRational			frameRate;
-+	AVDictionary		*formatParams = NULL;
- 	char				*p, filename[28], rateStr[20];
- 
- 	do_init_ffmpeg();
- 
--	memset(&formatParams, 0, sizeof(formatParams));
- #ifdef WIN32
- 	// video capture on windows only through Video For Windows driver
- 	inputFormat = av_find_input_format("vfwcap");
-@@ -622,7 +616,13 @@
- 		sprintf(filename, "/dev/dv1394/%d", camIdx);
- 	} else 
- 	{
--		inputFormat = av_find_input_format("video4linux");
-+		const char *formats[] = {"video4linux2,v4l2", "video4linux2", "video4linux"};
-+		int i, formatsCount = sizeof(formats) / sizeof(char*);
-+		for (i = 0; i < formatsCount; i++) {
-+			inputFormat = av_find_input_format(formats[i]);
-+			if (inputFormat)
-+				break;
-+		}
- 		sprintf(filename, "/dev/video%d", camIdx);
- 	}
- 	if (!inputFormat)
-@@ -636,20 +636,22 @@
- 		if ((p = strchr(filename, ':')) != 0)
- 			*p = 0;
- 	}
--	if (file && (p = strchr(file, ':')) != NULL)
--		formatParams.standard = p+1;
-+	if (file && (p = strchr(file, ':')) != NULL) {
-+		av_dict_set(&formatParams, "standard", p+1, 0);
-+	}
- #endif
- 	//frame rate
- 	if (m_captRate <= 0.f)
- 		m_captRate = defFrameRate;
- 	sprintf(rateStr, "%f", m_captRate);
--	av_parse_video_rate(&frameRate, rateStr);
--	// populate format parameters
--	// need to specify the time base = inverse of rate
--	formatParams.time_base.num = frameRate.den;
--	formatParams.time_base.den = frameRate.num;
--	formatParams.width = m_captWidth;
--	formatParams.height = m_captHeight;
-+
-+	av_dict_set(&formatParams, "framerate", rateStr, 0);
-+
-+	if (m_captWidth > 0 && m_captHeight > 0) {
-+		char video_size[64];
-+		BLI_snprintf(video_size, sizeof(video_size), "%dx%d", m_captWidth, m_captHeight);
-+		av_dict_set(&formatParams, "video_size", video_size, 0);
-+	}
- 
- 	if (openStream(filename, inputFormat, &formatParams) != 0)
- 		return;
-@@ -664,6 +666,8 @@
- 		// no need to thread if the system has a single core
- 		m_isThreaded =  true;
- 	}
-+
-+	av_dict_free(&formatParams);
- }
- 
- // play video
-diff -Naur blender-2.63a.orig/source/gameengine/VideoTexture/VideoFFmpeg.h blender-2.63a/source/gameengine/VideoTexture/VideoFFmpeg.h
---- blender-2.63a.orig/source/gameengine/VideoTexture/VideoFFmpeg.h	2012-05-10 11:48:50.000000000 -0300
-+++ blender-2.63a/source/gameengine/VideoTexture/VideoFFmpeg.h	2012-07-10 18:57:21.710327435 -0300
-@@ -46,10 +46,6 @@
- #  define FFMPEG_CODEC_IS_POINTER 1
- #endif
- 
--#if LIBAVFORMAT_VERSION_INT >= (52 << 16)
--#  define FFMPEG_PB_IS_POINTER 1
--#endif
--
- #ifdef FFMPEG_CODEC_IS_POINTER
- static inline AVCodecContext* get_codec_from_stream(AVStream* stream)
- {
-@@ -172,7 +168,7 @@
- 	double actFrameRate (void) { return m_frameRate * m_baseFrameRate; }
- 
- 	/// common function to video file and capture
--	int openStream(const char *filename, AVInputFormat *inputFormat, AVFormatParameters *formatParams);
-+	int openStream(const char *filename, AVInputFormat *inputFormat, AVDictionary **formatParams);
- 
- 	/// check if a frame is available and load it in pFrame, return true if a frame could be retrieved
- 	AVFrame* grabFrame(long frame);
diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD
new file mode 100644
index 000000000..e62331a98
--- /dev/null
+++ b/libre/cgminer-libre/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: monson <holymonson@gmail.com>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+# Contributor: David Manouchehri <david@davidmanouchehri.com>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+pkgname=cgminer-libre
+_pkgflag=libre
+pkgver=2.11.1
+_build=
+pkgrel=1
+pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer, without nonfree OpenCL recommendations."
+url='http://forum.bitcoin.org/index.php?topic=28402.0'
+license=('GPL3')
+arch=('i686' 'x86_64' 'mips64el')
+depends=('curl' 'libcl-libre')
+makedepends=('opencl-headers')
+source=("http://ck.kolivas.org/apps/${pkgname%-$_pkgflag}/${pkgname%-$_pkgflag}-$pkgver.tar.bz2"
+        "${pkgname%-$_pkgflag}.conf.d"
+        "${pkgname%-$_pkgflag}.service")
+backup=("etc/conf.d/${pkgname%-$_pkgflag}" "etc/${pkgname%-$_pkgflag}.conf")
+
+[ "$CARCH" == "x86_64" ] && makedepends+=('yasm')
+
+build() {
+  cd "$srcdir"
+  cd ${pkgname%-$_pkgflag}-$pkgver${_build}
+
+  # Use in-tree jansson since it is not compatible with jansson 2.0
+  #sed -e 's/^AC_CHECK_LIB(jansson, json_loads, request_jansson=false, request_jansson=true)$/request_jansson=true/' -i configure.ac
+
+  # Here you may want to use custom CFLAGS
+  #export CFLAGS="-O2 -march=native -mtune=native -msse2"
+
+  ./configure --prefix=/usr --enable-cpumining --disable-adl
+  
+  make
+}
+
+package() {
+  cd "$srcdir"/${pkgname%-$_pkgflag}-$pkgver${_build}
+
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 "$srcdir"/${pkgname%-$_pkgflag}.service "$pkgdir"/usr/lib/systemd/system/${pkgname%-$_pkgflag}.service
+  install -Dm644 "$srcdir"/${pkgname%-$_pkgflag}.conf.d "$pkgdir"/etc/conf.d/${pkgname%-$_pkgflag}
+  sed 's#/usr/local/bin#/usr/bin#g' example.conf > ${pkgname%-$_pkgflag}.conf
+  install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf
+}
+
+md5sums=('aa2199a9756cbca5582c03e8c1a98dd1'
+         'fe4a243fabe24608f5c05e40f0f118f6'
+         'bd76fc92fedce18c59ccea2aa79cc664')
diff --git a/libre/cgminer-libre/cgminer.conf.d b/libre/cgminer-libre/cgminer.conf.d
new file mode 100644
index 000000000..88ec535d6
--- /dev/null
+++ b/libre/cgminer-libre/cgminer.conf.d
@@ -0,0 +1,11 @@
+# Use JSON-format configuration. (recommended)
+CGMINER_CONF="/etc/cgminer.conf"
+
+# Uncommend this if you prefer simple command-line arguments.
+#CGMINER_CONF=""
+#CGMINER_PROTOCOL="http"
+#CGMINER_IP="127.0.0.1"
+#CGMINER_PORT="8332"
+#CGMINER_USER="username"
+#CGMINER_PASS="password"
+CGMINER_ARGS="--syslog"
diff --git a/libre/cgminer-libre/cgminer.service b/libre/cgminer-libre/cgminer.service
new file mode 100644
index 000000000..84461879f
--- /dev/null
+++ b/libre/cgminer-libre/cgminer.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Multi-threaded multi-pool CPU and GPU miner for bitcoin
+
+[Service]
+ExecStart=/usr/bin/cgminer -T --config /etc/cgminer.conf --syslog
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch b/libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
deleted file mode 100644
index 5aadeb883..000000000
--- a/libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 73283f1332e90fbb6fe0caa39a038cb16b83a54c Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Wed, 5 Dec 2012 22:42:25 +0100
-Subject: [PATCH] Revert "Also check parent mimetypes in
- protocolForArchiveMimetype()."
-
-This reverts commit 4f296cfbced2c4ad54beec8f500ed2d3fc04ee05.
-It breaks opening odt and other zip-based files in external apps.
-That's what I get for delegating the testing :-)
-BUG: 311214
----
- kio/kio/kprotocolmanager.cpp |   19 +------------------
- 1 files changed, 1 insertions(+), 18 deletions(-)
-
-diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp
-index 3f1cadd..502a3e6 100644
---- a/kio/kio/kprotocolmanager.cpp
-+++ b/kio/kio/kprotocolmanager.cpp
-@@ -47,7 +47,6 @@
- #include <ksharedconfig.h>
- #include <kstandarddirs.h>
- #include <kurl.h>
--#include <kmimetype.h>
- #include <kmimetypetrader.h>
- #include <kprotocolinfofactory.h>
- 
-@@ -1190,23 +1189,7 @@ QString KProtocolManager::protocolForArchiveMimetype( const QString& mimeType )
-             }
-         }
-     }
--    const QString prot = d->protocolForArchiveMimetypes.value(mimeType);
--    if (!prot.isEmpty())
--        return prot;
--
--    // Check parent mimetypes
--    KMimeType::Ptr mime = KMimeType::mimeType(mimeType);
--    if (mime) {
--        const QStringList parentMimeTypes = mime->allParentMimeTypes();
--        Q_FOREACH(const QString& parentMimeType, parentMimeTypes) {
--            const QString res = d->protocolForArchiveMimetypes.value(parentMimeType);
--            if (!res.isEmpty()) {
--                return res;
--            }
--        }
--    }
--
--    return QString();
-+    return d->protocolForArchiveMimetypes.value(mimeType);
- }
- 
- #undef PRIVATE_DATA
--- 
-1.7.7
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 18947854a..76d09f737 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179135 2013-03-04 11:09:00Z andrea $
+# $Id: PKGBUILD 179600 2013-03-07 17:47:07Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,7 +6,7 @@
 _pkgname=kdelibs
 pkgname=kdelibs-libre
 pkgver=4.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -22,21 +22,23 @@ replaces=('kdelibs')
 conflicts=('kdelibs')
 install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
-        'kde-applications-menu.patch'
-        'khtml-fsdg.diff')
+        'kde-applications-menu.patch' 'qt4.patch' 'khtml-fsdg.diff')
 sha1sums=('91d1ab65a561decf7506df45bda7a7fec9a524bb'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
+          'ed1f57ee661e5c7440efcaba7e51d2554709701c'
           'a1502a964081ad583a00cf90c56e74bf60121830')
 
 build() {
-       cd "${srcdir}"/${_pkgname}-${pkgver}
-
+       cd ${_pkgname}-${pkgver}
        # avoid file conflict with gnome-menus
        patch -p1 -i "${srcdir}"/kde-applications-menu.patch
+       # qmake refers to Qt5
+       patch -p1 -i "${srcdir}"/qt4.patch
        # Don't ask the user to download a plugin, it's probably nonfree.
        patch -p1 -i "${srcdir}"/khtml-fsdg.diff
 
-       cd "${srcdir}"
+       cd ../
+
        mkdir build
        cd build
        cmake ../${_pkgname}-${pkgver} \
diff --git a/libre/kdelibs-libre/fix-crash-on-open-with.patch b/libre/kdelibs-libre/fix-crash-on-open-with.patch
deleted file mode 100644
index 60556386d..000000000
--- a/libre/kdelibs-libre/fix-crash-on-open-with.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 0820b3173aff4f0f3c803a9e75e726024da38ee5
-Author: David Faure <faure@kde.org>
-Date:   Thu Dec 6 11:55:05 2012 +0100
-
-    Fix crash when no service was selected (user clicked on "Open With...")
-
-diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp
-index 6d84800..6de0380 100644
---- a/kparts/browserrun.cpp
-+++ b/kparts/browserrun.cpp
-@@ -304,7 +304,7 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable(const QString& _
-                          this, SLOT(slotCopyToTempFileResult(KJob*)) );
-                 return Delayed; // We'll continue after the job has finished
-             }
--            if (selectedService) {
-+            if (selectedService && question.selectedService()) {
-                 *selectedService = question.selectedService();
-                 // KRun will use this when starting an app
-                 KRun::setPreferredService(question.selectedService()->desktopEntryName());
diff --git a/libre/kdelibs-libre/fix-kmail-crash.patch b/libre/kdelibs-libre/fix-kmail-crash.patch
deleted file mode 100644
index 27caa25f0..000000000
--- a/libre/kdelibs-libre/fix-kmail-crash.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-commit 979b0436510e7807c054e79c40c3753834ac2863
-Author: Sebastian Trueg <trueg@kde.org>
-Date:   Thu Mar 15 09:14:35 2012 +0100
-
-    Thread-safe ResourceWatcher handling.
-    
-    We simply perform all RW operations in the manager thread.
-    
-    BUG: 295474
-    FIXED-IN: 4.8.2
-
-diff --git a/nepomuk/core/resourcedata.cpp b/nepomuk/core/resourcedata.cpp
-index abe55ea..9d45228 100644
---- a/nepomuk/core/resourcedata.cpp
-+++ b/nepomuk/core/resourcedata.cpp
-@@ -175,7 +175,8 @@ void Nepomuk::ResourceData::resetAll( bool isDelete )
-     if( !m_uri.isEmpty() ) {
-         m_rm->m_initializedData.remove( m_uri );
-         if( m_rm->m_watcher && m_addedToWatcher ) {
--            m_rm->m_watcher->removeResource(Resource::fromResourceUri(m_uri));
-+            // See load() for an explanation of the QMetaObject call
-+            QMetaObject::invokeMethod(m_rm->m_watcher, "removeResource", Qt::AutoConnection, Q_ARG(Nepomuk::Resource, Resource::fromResourceUri(m_uri)));
-             m_addedToWatcher = false;
-         }
-     }
-@@ -393,16 +394,23 @@ bool Nepomuk::ResourceData::load()
-         m_cache.clear();
- 
-         if(!m_rm->m_watcher) {
-+            //
-+            // The ResourceWatcher is not thread-safe. Thus, we need to ensure the safety ourselves.
-+            // We do that by simply handling all RW related operations in the manager thread.
-+            // This also means to invoke methods on the watcher through QMetaObject to make sure they
-+            // get queued in case of calls between different threads.
-+            //
-             m_rm->m_watcher = new ResourceWatcher(m_rm->m_manager);
-+            m_rm->m_watcher->moveToThread(m_rm->m_manager->thread());
-             QObject::connect( m_rm->m_watcher, SIGNAL(propertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)),
-                               m_rm->m_manager, SLOT(slotPropertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)) );
-             QObject::connect( m_rm->m_watcher, SIGNAL(propertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)),
-                               m_rm->m_manager, SLOT(slotPropertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)) );
-             m_rm->m_watcher->addResource( Nepomuk::Resource::fromResourceUri(m_uri) );
--            m_rm->m_watcher->start();
-+            QMetaObject::invokeMethod(m_rm->m_watcher, "start", Qt::AutoConnection);
-         }
-         else {
--            m_rm->m_watcher->addResource( Nepomuk::Resource::fromResourceUri(m_uri) );
-+            QMetaObject::invokeMethod(m_rm->m_watcher, "addResource", Qt::AutoConnection, Q_ARG(Nepomuk::Resource, Nepomuk::Resource::fromResourceUri(m_uri)) );
-         }
-         m_addedToWatcher = true;
- 
-diff --git a/nepomuk/core/resourcewatcher.h b/nepomuk/core/resourcewatcher.h
-index 06b9622..92b12f5 100644
---- a/nepomuk/core/resourcewatcher.h
-+++ b/nepomuk/core/resourcewatcher.h
-@@ -93,6 +93,7 @@ namespace Nepomuk {
-          */
-         virtual ~ResourceWatcher();
- 
-+    public Q_SLOTS:
-         /**
-          * \brief Add a type to be watched.
-          *
-@@ -204,7 +205,6 @@ namespace Nepomuk {
-          */
-         QList<Types::Property> properties() const;
- 
--    public Q_SLOTS:
-         /**
-          * \brief Start the signalling of changes.
-          *
diff --git a/libre/kdelibs-libre/fix-save-path.patch b/libre/kdelibs-libre/fix-save-path.patch
deleted file mode 100644
index 1a00221a7..000000000
--- a/libre/kdelibs-libre/fix-save-path.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 793e2a69f8aa193b60494b03d51c5fd44373c0e7
-Author: Jonathan Marten <jjm@keelhaul.me.uk>
-Date:   Wed Nov 7 12:45:03 2012 +0000
-
-    Fix regression: specified or remembered save path is not used
-    
-    As requested on review https://git.reviewboard.kde.org/r/106475/
-
-diff --git a/kfile/kfilewidget.cpp b/kfile/kfilewidget.cpp
-index 65deca2..e755aae 100644
---- a/kfile/kfilewidget.cpp
-+++ b/kfile/kfilewidget.cpp
-@@ -2593,8 +2593,12 @@ KUrl KFileWidget::getStartUrl( const KUrl& startDir,
-         }
-         else						// not special "kfiledialog" URL
-         {
--            if (!startDir.isRelative())	// has directory, maybe with filename
--            {
-+            // We can use startDir as the starting directory if either:
-+            // (a) it has a directory part, or
-+            // (b) there is a scheme (protocol), and it is not just "file".
-+            if (!startDir.directory().isEmpty() ||
-+                (!startDir.scheme().isEmpty() && !startDir.isLocalFile()))
-+            {						// can use start directory
-                 ret = startDir;				// will be checked by stat later
-                 // If we won't be able to list it (e.g. http), then use default
-                 if ( !KProtocolManager::supportsListing( ret ) ) {
diff --git a/libre/kdelibs-libre/qt4.patch b/libre/kdelibs-libre/qt4.patch
new file mode 100644
index 000000000..bb4312d40
--- /dev/null
+++ b/libre/kdelibs-libre/qt4.patch
@@ -0,0 +1,11 @@
+--- kdelibs-4.10.1/cmake/modules/FindQt4.cmake~	2013-03-07 16:57:29.735552097 +0000
++++ kdelibs-4.10.1/cmake/modules/FindQt4.cmake	2013-03-07 16:57:52.038725421 +0000
+@@ -446,7 +446,7 @@
+ # check for qmake
+ # Debian uses qmake-qt4
+ # macports' Qt uses qmake-mac
+-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
++FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac PATHS
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
diff --git a/libre/kdelibs-libre/use-pythondontwritebytecode.patch b/libre/kdelibs-libre/use-pythondontwritebytecode.patch
deleted file mode 100644
index 9b5d92042..000000000
--- a/libre/kdelibs-libre/use-pythondontwritebytecode.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
-Date: Wed, 07 Nov 2012 19:08:01 +0000
-Subject: Respect PYTHONDONTWRITEBYTECODE environmental variable.
-X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&amp;a=commitdiff&amp;h=5a3cedacdb6485f7551090467cffb2cdf150b05a
----
-Respect PYTHONDONTWRITEBYTECODE environmental variable.
-
-BUG: 276151
-REVIEW: 107228
----
-
-
---- a/cmake/modules/PythonMacros.cmake
-+++ b/cmake/modules/PythonMacros.cmake
-@@ -23,54 +23,56 @@
-   # Install the source file.
-   INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESTINATION_DIR})
- 
--  # Byte compile and install the .pyc file.        
--  GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
--  GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
--  GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
--  GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
-+  # Byte compile and install the .pyc file.
-+  IF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
-+    GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
-+    GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
-+    GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
-+    GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
- 
--  if(WIN32)
--    string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
--  endif(WIN32)
-+    if(WIN32)
-+        string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
-+    endif(WIN32)
- 
--  SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
-+    SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
- 
--  # Python 3.2 changed the pyc file location
--  IF(PYTHON_SHORT_VERSION GREATER 3.1)
--    # To get the right version for suffix
--    STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION})
--    SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc)
--  ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
--    SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
--  ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
-+    # Python 3.2 changed the pyc file location
-+    IF(PYTHON_SHORT_VERSION GREATER 3.1)
-+        # To get the right version for suffix
-+        STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION})
-+        SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc)
-+    ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
-+        SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
-+    ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
- 
--  FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
-+    FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
- 
--  SET(_message "Byte-compiling ${_bin_py}")
-+    SET(_message "Byte-compiling ${_bin_py}")
- 
--  GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
--  IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto itself.
--    ADD_CUSTOM_COMMAND(
--      TARGET compile_python_files
--      COMMAND ${CMAKE_COMMAND} -E echo ${_message}
--      COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
--      DEPENDS ${_absfilename}
--    )
--  ELSE(_abs_bin_py STREQUAL ${_absfilename})
--    ADD_CUSTOM_COMMAND(
--      TARGET compile_python_files
--      COMMAND ${CMAKE_COMMAND} -E echo ${_message} 
--      COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
--      COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
--      DEPENDS ${_absfilename}
--    )
--  ENDIF(_abs_bin_py STREQUAL ${_absfilename})
-+    GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
-+    IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto itself.
-+        ADD_CUSTOM_COMMAND(
-+        TARGET compile_python_files
-+        COMMAND ${CMAKE_COMMAND} -E echo ${_message}
-+        COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
-+        DEPENDS ${_absfilename}
-+        )
-+    ELSE(_abs_bin_py STREQUAL ${_absfilename})
-+        ADD_CUSTOM_COMMAND(
-+        TARGET compile_python_files
-+        COMMAND ${CMAKE_COMMAND} -E echo ${_message} 
-+        COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
-+        COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
-+        DEPENDS ${_absfilename}
-+        )
-+    ENDIF(_abs_bin_py STREQUAL ${_absfilename})
- 
--  IF(PYTHON_SHORT_VERSION GREATER 3.1)
--    INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/)
--  ELSE (PYTHON_SHORT_VERSION GREATER 3.1)
--      INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR})
--  ENDIF (PYTHON_SHORT_VERSION GREATER 3.1)
-+    IF(PYTHON_SHORT_VERSION GREATER 3.1)
-+        INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/)
-+    ELSE (PYTHON_SHORT_VERSION GREATER 3.1)
-+        INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR})
-+    ENDIF (PYTHON_SHORT_VERSION GREATER 3.1)
-+  ENDIF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
- 
- ENDMACRO(PYTHON_INSTALL)
- 
-
diff --git a/libre/luxblend25/PKGBUILD b/libre/luxblend25/PKGBUILD
index 82dd36a40..26640795f 100644
--- a/libre/luxblend25/PKGBUILD
+++ b/libre/luxblend25/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgbase=luxrender
 pkgname=luxblend25
-srcver=3b84c4d3f009
-pkgver=1.2.v2.66
+srcver=3a928b723b29
+pkgver=1.1.v2.65
 _pkgver=${pkgver::3}
 reqname=blender
 reqver=${pkgver:5}
@@ -32,10 +32,10 @@ replaces=(
   $pkgname
 )
 source=(
-  "http://src.$pkgbase.net/$pkgname/archive/$srcver.tar.bz2"
+  "https://src.$pkgbase.net/$pkgname/archive/$srcver.tar.bz2"
 )
 sha512sums=(
-  15025d192088266d781a6e80ecb4982b188d73bb7c6b12c93689a4265e967f92bcf93fc724939447c5ee7ea3f63ce52ad6bf3d20a795dcebf86e6940a3aa33b3
+  f5aadc77e699f6b7259ece271b0c50ca7be5858bb628b99aedbb23b64e5587ac59cc3d1c52e063ba89c9d340f915727046e4d3017b26238425d43d3bba14f017
 )
 
 package() {
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
new file mode 100644
index 000000000..0dcfb0a5b
--- /dev/null
+++ b/libre/luxrender-libre/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Contributor: flixie <69one@gmx.net>
+# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+pkgname=luxrender-libre
+pkgver=1.2
+_pkgver=ee0b9ff73d62
+pkgrel=1
+pkgdesc="Rendering system for physically correct, unbiased image synthesis"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.${pkgname%-$_pkgflag}.net/"
+license=('GPL')
+depends=('boost-libs' 'freeimage' 'openexr' 'libcl' 'libgl')
+optdepends=('luxblend25: Blender exporter' 'qt4: Qt GUI' \
+            'python: Python interface (pylux)')
+makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers')
+source=(https://bitbucket.org/${pkgname%-$_pkgflag}/lux/get/$_pkgver.tar.bz2)
+md5sums=('eb1ed9ecfe540896863ad4ee4da5a2f9')
+
+build() {
+  cd "$srcdir"/${pkgname%-$_pkgflag}-lux-$_pkgver
+
+  # fix the installation
+  sed -i '/.*wxgui.*/ d' CMakeLists.txt
+
+  export CXXFLAGS="$CXXFLAGS -lpthread"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLUXRAYS_DISABLE_OPENCL=OFF \
+    -DPYTHON_CUSTOM=ON \
+    -DPYTHON_LIBRARIES=/usr/lib/libpython3.3m.so \
+    -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m/ \
+    .
+  make
+}
+
+package() {
+  cd "$srcdir"/${pkgname%-$_pkgflag}-lux-$_pkgver
+  make DESTDIR="$pkgdir" install
+
+  # fix library path on x86_64
+  [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
+
+  #install pylux
+  install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.3/pylux.so
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 4e92336c2..6f82bded2 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -29,11 +29,11 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
 md5sums=('387965c7125e60e5f0b9ff3b427fe0f9'
          '1a70392526c8768470da678b31905a6e'
          '1a9b79788640907a2b34e8671cacc94a'
-         'a9ddd43891bed364e1e97d27b2887bf1' 
+         'a9ddd43891bed364e1e97d27b2887bf1'
          '2e8cbf55a94b1954b167c5dee6b62317'
-         '6f284de1facaead73de918b4f380fa7f'
-         'f2213945821548c05d654a299ce077f7'
-         'a45ce4bd0bafb2d60181da5cfa7ceede'
+         '4ce9e714919e632f48129985ea6b671f'
+         '43628d586f93d64354654ae3f51aab85'
+         'f117e2e13f7d70629ce6923117c73881'
          'debc512689a1aa8c124fe0ccf27f5758')
 
 build() {
diff --git a/libre/pacman/pacman.conf b/libre/pacman/pacman.conf
index 59e55cf0b..fa8839c3d 100644
--- a/libre/pacman/pacman.conf
+++ b/libre/pacman/pacman.conf
@@ -16,7 +16,7 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 HoldPkg     = pacman glibc
 # If upgrades are available for these packages they will be asked for first
-SyncFirst   = pacman
+SyncFirst   = archlinux-keyring parabola-keyring
 #XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
diff --git a/libre/pacman/pacman.conf.mips64el b/libre/pacman/pacman.conf.mips64el
index 3c32ddb78..e6cff6811 100644
--- a/libre/pacman/pacman.conf.mips64el
+++ b/libre/pacman/pacman.conf.mips64el
@@ -16,7 +16,7 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 HoldPkg     = pacman glibc
 # If upgrades are available for these packages they will be asked for first
-SyncFirst   = pacman
+SyncFirst   = archlinux-keyring parabola-keyring
 #XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
diff --git a/libre/pacman/pacman.conf.x86_64 b/libre/pacman/pacman.conf.x86_64
index 6a28406eb..aa17bc498 100644
--- a/libre/pacman/pacman.conf.x86_64
+++ b/libre/pacman/pacman.conf.x86_64
@@ -16,7 +16,7 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 HoldPkg     = pacman glibc
 # If upgrades are available for these packages they will be asked for first
-SyncFirst   = pacman
+SyncFirst   = archlinux-keyring parabola-keyring
 #XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled