diff --git a/common/shlibs b/common/shlibs index f6d87ac7f2b..842703e9f1e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -377,6 +377,7 @@ libswresample.so.0 libswresample-0.8.6_1 libpostproc.so.52 libpostproc-0.8.6_1 libavcodec.so.54 libavcodec-1.0.1_1 libavutil.so.51 libavutil-1.0.1_1 +libavutil.so.52 libavutil-1.2.1_1 libavfilter.so.3 libavfilter-1.0.1_1 libavcodec.so.53 ffmpeg-0.10x-compat-0.10.6_1 libpostproc.so.52 ffmpeg-0.10x-compat-0.10.6_1 @@ -1359,3 +1360,4 @@ libktorrent.so.5 libktorrent-1.3.1_1 libvncserver.so.0 libvncserver-0.9.9_1 libvncclient.so.0 libvncserver-0.9.9_1 libotr3.so.2 libotr3-3.2.1_1 +libotr.so.5 libotr-4.0.0_1 diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template index 595d8ac0889..9aa1224a9f3 100644 --- a/srcpkgs/audacious-plugins/template +++ b/srcpkgs/audacious-plugins/template @@ -1,10 +1,11 @@ # Template file for 'audacious-plugins'. pkgname=audacious-plugins version=3.3.3 -revision=1 +revision=2 build_style=gnu-configure +hostmakedepends="pkg-config" makedepends="audacious-devel>=${version} alsa-lib-devel pulseaudio-devel jack-devel - lame-devel libvorbis-devel libflac-devel mpg123-devel faad2-devel ffmpeg-devel>=1.0.1 + lame-devel libvorbis-devel libflac-devel mpg123-devel faad2-devel ffmpeg-devel>=1.2 libmodplug-devel fluidsynth-devel libcdio-devel wavpack-devel libnotify-devel libcurl-devel libmtp-devel neon-devel libmms-devel gtk+3-devel libxml2-devel" short_desc="Plugins for the Audacious media player" diff --git a/srcpkgs/cherokee/patches/ffmpeg.patch b/srcpkgs/cherokee/patches/ffmpeg.patch new file mode 100644 index 00000000000..03e8badf1cc --- /dev/null +++ b/srcpkgs/cherokee/patches/ffmpeg.patch @@ -0,0 +1,14 @@ +--- cherokee/handler_streaming.c.ffmpeg 2012-06-04 12:56:16.000000000 +0800 ++++ cherokee/handler_streaming.c 2012-06-04 12:56:40.000000000 +0800 +@@ -380,7 +380,7 @@ + if (likely (secs > 0)) { + long tmp; + +- tmp = (hdl->avformat->file_size / secs); ++ tmp = (avio_size(hdl->avformat) / secs); + if (tmp > rate) { + rate = tmp; + TRACE(ENTRIES, "New rate: %d bytes/s\n", rate); + + + diff --git a/srcpkgs/cherokee/template b/srcpkgs/cherokee/template index 543f7d0a2e2..f2a0b59b6ab 100644 --- a/srcpkgs/cherokee/template +++ b/srcpkgs/cherokee/template @@ -1,18 +1,18 @@ # Template file for 'cherokee' pkgname=cherokee version=1.2.101 -revision=5 +revision=6 build_style=gnu-configure configure_args="--prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static --with-wwwroot=/srv/httpd --with-wwwuser=httpd --with-wwwgroup=httpd --with-python=python --enable-os-string=Linux" makedepends="pcre-devel>=8.30 python-devel libldap-devel pam-devel - libmysqlclient-devel ffmpeg-devel geoip-devel" + libmysqlclient-devel ffmpeg-devel>=1.2 geoip-devel" short_desc="An innovative, feature rich, and yet easy to configure open source Web Server" maintainer="davehome " homepage="http://www.cherokee-project.com/" license="GPL-2" -distfiles="http://www.${pkgname}-project.com/download/1.2/${version}/${pkgname}-${version}.tar.gz" +distfiles="http://www.cherokee-project.de/mirrors/cherokee/1.2/${version}/cherokee-${version}.tar.gz" checksum=ca465ab3772479fc843b38ffc45113bf24d8bfae9185cdd5176b099d5a17feb8 long_desc=" Cherokee is an open-source Cross-platform Web server that runs on Linux, BSD @@ -40,24 +40,26 @@ post_install() { cherokee-devel_package() { depends="libcherokee>=${version}" - short_desc+=" -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/bin/cherokee-config vmove usr/include vmove usr/lib/pkgconfig vmove usr/share/aclocal + vmove "usr/lib/*.so" } } libcherokee_package() { - short_desc="${short_desc} (Runtime library)" + short_desc+=" - Runtime library" pkg_install() { - vmove "usr/lib/*.so*" + vmove "usr/lib/*.so.*" vmove usr/lib/cherokee } } cherokee_package() { + depends="shadow" conf_files="/etc/${pkgname}/${pkgname}.conf" systemd_services="cherokee.service on" system_accounts="httpd" @@ -68,6 +70,6 @@ cherokee_package() { /var/log/cherokee 0755 httpd httpd /var/lib/cherokee/graphs/images 0755 httpd httpd" pkg_install() { - vmove usr + vmove all } } diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index acc3871f9da..e6f58b975e2 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -1,13 +1,13 @@ # Template file for 'ffmpeg' pkgname=ffmpeg -version=1.0.5 -revision=5 +version=1.2.1 +revision=1 short_desc="Decoding, encoding and streaming software" maintainer="Juan RP " license="GPL-3" homepage="http://www.ffmpeg.org" distfiles="${homepage}/releases/ffmpeg-${version}.tar.bz2" -checksum=1f1af23112e2da8403abce605749db9111d45d2e4e28910831e778c6e2cbdcce +checksum=0302375c3a64e9c2facfa7cbeb1aa333a39fdf6bbacda228cd48e04bf9ee32ca hostmakedepends="pkg-config perl yasm" makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel @@ -59,6 +59,9 @@ do_build() { do_install() { make DESTDIR=${DESTDIR} install install-man + # Move devel manpages to section 3. + vmkdir usr/share/man/man3 + mv ${DESTDIR}/usr/share/man/man1/*.3 ${DESTDIR}/usr/share/man/man3 } libavcodec_package() { @@ -127,6 +130,7 @@ ffmpeg-devel_package() { vmove usr/lib/pkgconfig vmove "usr/lib/*.so" vmove usr/share/ffmpeg/examples + vmove usr/share/man/man3 } } diff --git a/srcpkgs/gtkmm2/template b/srcpkgs/gtkmm2/template index 55743dbd321..b4fd2381a21 100644 --- a/srcpkgs/gtkmm2/template +++ b/srcpkgs/gtkmm2/template @@ -1,6 +1,6 @@ # Template build file for 'gtkmm'. pkgname=gtkmm2 -version=2.24.3 +version=2.24.4 revision=1 wrksrc=gtkmm-${version} build_style=gnu-configure @@ -12,7 +12,7 @@ homepage="http://www.gtkmm.org/" license="LGPL-2.1" maintainer="Juan RP " distfiles="${GNOME_SITE}/gtkmm/2.24/gtkmm-$version.tar.xz" -checksum=c564a438677174b97d69dd70467cb03c933481006398dc9377417aa6abe02a39 +checksum=443a2ff3fcb42a915609f1779000390c640a6d7fd19ad8816e6161053696f5ee long_desc=" gtkmm (previously known as Gtk--) is the official C++ interface for the popular GUI library GTK+. Highlights include typesafe callbacks, widgets @@ -35,6 +35,7 @@ gtkmm2-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/g*" + vmove "usr/lib/*.so" } } diff --git a/srcpkgs/handbrake-cli b/srcpkgs/handbrake-cli new file mode 120000 index 00000000000..abe3cc13f20 --- /dev/null +++ b/srcpkgs/handbrake-cli @@ -0,0 +1 @@ +handbrake \ No newline at end of file diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template new file mode 100644 index 00000000000..14249d0dd60 --- /dev/null +++ b/srcpkgs/handbrake/template @@ -0,0 +1,55 @@ +# Template file for 'handbrake' +pkgname=handbrake +version=0.9.9 +revision=1 +wrksrc="HandBrake-${version}" +hostmakedepends="pkg-config intltool automake libtool python yasm wget gettext-devel" +makedepends="zlib-devel bzip2-devel libnotify-devel gtk+3-devel ncurses-devel + gst-plugins-base-devel gst-plugins-good webkitgtk-devel + dbus-glib-devel fribidi-devel libass-devel fontconfig-devel libxml2-devel + libogg-devel libtheora-devel libsamplerate-devel libbluray-devel x264-devel + hicolor-icon-theme desktop-file-utils" +short_desc="Multithreaded video transcoder" +maintainer="Juan RP " +license="GPL-3" +homepage="http://handbrake.fr/" +distfiles="${SOURCEFORGE_SITE}/${pkgname}/HandBrake-${version}.tar.bz2" +checksum=a71dd774104cda00cfb51a813550351d638253791f2f419d04a66f3158a835b3 + +do_configure() { + sed -e '/MODULES += contrib\/libbluray/d' \ + -e '/MODULES += contrib\/x264/d' \ + -i make/include/main.defs + + cd gtk + sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \ + -e '/AM_PROG_CC_STDC/d' -i configure.ac + autoreconf -vi + + cd ${wrksrc} + ./configure --prefix=/usr --force --disable-gtk-update-checks +} + +do_build() { + cd build + make ${makejobs} +} + +do_install() { + cd build + make DESTDIR=${DESTDIR} install +} + +handbrake-cli_package() { + short_desc+=" - CLI utility" + pkg_install() { + vmove usr/bin/HandBrakeCLI + } +} + +handbrake_package() { + depends="gst-plugins-good" + pkg_install() { + vmove all + } +} diff --git a/srcpkgs/idjc/template b/srcpkgs/idjc/template index a9a46c2d6d9..2d2a5dcd0e6 100644 --- a/srcpkgs/idjc/template +++ b/srcpkgs/idjc/template @@ -1,10 +1,11 @@ # Template file for 'idjc' pkgname=idjc version=0.8.7 -revision=1 +revision=2 build_style=gnu-configure +hostmakedepends="pkg-config" makedepends="libvorbis-devel libogg-devel jack-devel libsamplerate-devel - libflac-devel libsndfile-devel libmad-devel ffmpeg-devel>=1.0.1 + libflac-devel libsndfile-devel libmad-devel ffmpeg-devel>=1.2 speex-devel glib-devel pixman-devel lame-devel pygtk-devel mutagen desktop-file-utils shared-mime-info" short_desc="Internet DJ Console" diff --git a/srcpkgs/libotr-devel b/srcpkgs/libotr-devel new file mode 120000 index 00000000000..f6addfd62a7 --- /dev/null +++ b/srcpkgs/libotr-devel @@ -0,0 +1 @@ +libotr \ No newline at end of file diff --git a/srcpkgs/libotr-progs b/srcpkgs/libotr-progs new file mode 120000 index 00000000000..f6addfd62a7 --- /dev/null +++ b/srcpkgs/libotr-progs @@ -0,0 +1 @@ +libotr \ No newline at end of file diff --git a/srcpkgs/libotr/template b/srcpkgs/libotr/template new file mode 100644 index 00000000000..aa89431f69e --- /dev/null +++ b/srcpkgs/libotr/template @@ -0,0 +1,38 @@ +# Template build file for 'libotr'. +pkgname=libotr +version=4.0.0 +revision=1 +build_style=gnu-configure +makedepends="libgcrypt-devel" +short_desc="Off-the-Record Messaging Library and Toolkit" +maintainer="Juan RP " +homepage="http://www.cypherpunks.ca/otr/" +license="GPL-2, LGPL-2.1" +distfiles="http://www.cypherpunks.ca/otr/libotr-${version}.tar.gz" +checksum=3f911994409898e74527730745ef35ed75c352c695a1822a677a34b2cf0293b4 + +libotr-progs_package() { + short_desc+=" - applications" + pkg_install() { + vmove usr/bin + vmove usr/share/man + } +} + +libotr-devel_package() { + depends="${sourcepkg}-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + vmove usr/share/aclocal + } +} + +libotr_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/lightspark/patches/0001-Search-paths-for-LLVM-3.1-3.2.patch b/srcpkgs/lightspark/patches/0001-Search-paths-for-LLVM-3.1-3.2.patch new file mode 100644 index 00000000000..070ff35bcf6 --- /dev/null +++ b/srcpkgs/lightspark/patches/0001-Search-paths-for-LLVM-3.1-3.2.patch @@ -0,0 +1,25 @@ +From 508229a1ea169c8de7acf7f4284d6c56f08bedc4 Mon Sep 17 00:00:00 2001 +From: Antti Ajanki +Date: Sun, 12 May 2013 11:19:48 +0300 +Subject: [PATCH 01/33] Search paths for LLVM 3.1/3.2 + +--- + conf/FindLLVM.cmake | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/conf/FindLLVM.cmake b/conf/FindLLVM.cmake +index 7bd52e2..ab8f95d 100644 +--- a/conf/FindLLVM.cmake ++++ b/conf/FindLLVM.cmake +@@ -51,6 +51,8 @@ else (LLVM_INCLUDE_DIR) + /usr/lib/llvm-2.8/bin + /usr/lib/llvm-2.9/bin + /usr/lib/llvm-3.0/bin ++ /usr/lib/llvm-3.1/bin ++ /usr/lib/llvm-3.2/bin + ) + + find_program(LLVM_GCC_EXECUTABLE +-- +1.8.3 + diff --git a/srcpkgs/lightspark/patches/0001-Support-for-LLVM-3.3.patch b/srcpkgs/lightspark/patches/0001-Support-for-LLVM-3.3.patch new file mode 100644 index 00000000000..6a2e48a140f --- /dev/null +++ b/srcpkgs/lightspark/patches/0001-Support-for-LLVM-3.3.patch @@ -0,0 +1,128 @@ +From 56f4f48c47983432670d7aaa18614a98bd35961a Mon Sep 17 00:00:00 2001 +From: Antti Ajanki +Date: Sat, 18 May 2013 11:36:52 +0300 +Subject: [PATCH 01/29] Support for LLVM 3.3 + +--- + conf/FindLLVM.cmake | 6 ++++++ + src/scripting/abc.cpp | 15 +++++++++++---- + src/scripting/abc_codesynt.cpp | 25 ++++++++++++++++++------- + 3 files changed, 35 insertions(+), 11 deletions(-) + +diff --git a/conf/FindLLVM.cmake b/conf/FindLLVM.cmake +index ab8f95d..c94d7d4 100644 +--- a/conf/FindLLVM.cmake ++++ b/conf/FindLLVM.cmake +@@ -53,6 +53,7 @@ else (LLVM_INCLUDE_DIR) + /usr/lib/llvm-3.0/bin + /usr/lib/llvm-3.1/bin + /usr/lib/llvm-3.2/bin ++ /usr/lib/llvm-3.3/bin + ) + + find_program(LLVM_GCC_EXECUTABLE +@@ -170,11 +171,16 @@ else (LLVM_INCLUDE_DIR) + + set(CMAKE_REQUIRED_INCLUDES ${LLVM_INCLUDE_DIR}) + check_include_file_cxx("llvm/DataLayout.h" HAVE_DATALAYOUT_H) ++ check_include_file_cxx("llvm/IR/DataLayout.h" HAVE_IR_DATALAYOUT_H) + unset(CMAKE_REQUIRED_INCLUDES) + MESSAGE(STATUS "HAVE_DATALAYOUT_H: " ${HAVE_DATALAYOUT_H}) ++ MESSAGE(STATUS "HAVE_IR_DATALAYOUT_H: " ${HAVE_IR_DATALAYOUT_H}) + IF(HAVE_DATALAYOUT_H) + ADD_DEFINITIONS(-DHAVE_DATALAYOUT_H) + ENDIF(HAVE_DATALAYOUT_H) ++ IF(HAVE_IR_DATALAYOUT_H) ++ ADD_DEFINITIONS(-DHAVE_IR_DATALAYOUT_H) ++ ENDIF(HAVE_IR_DATALAYOUT_H) + + exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --cxxflags OUTPUT_VARIABLE LLVM_COMPILE_FLAGS ) + MESSAGE(STATUS "LLVM CXX flags: " ${LLVM_COMPILE_FLAGS}) +diff --git a/src/scripting/abc.cpp b/src/scripting/abc.cpp +index 608fe01..49f2e06 100644 +--- a/src/scripting/abc.cpp ++++ b/src/scripting/abc.cpp +@@ -23,12 +23,19 @@ + + #include "compat.h" + +-#include + #include + #include + #include +-#include +-#ifdef HAVE_DATALAYOUT_H ++#ifdef HAVE_IR_DATALAYOUT_H ++# include ++# include ++#else ++# include ++# include ++#endif ++#ifdef HAVE_IR_DATALAYOUT_H ++# include ++#elif defined HAVE_DATALAYOUT_H + # include + #else + # include +@@ -1516,7 +1523,7 @@ void ABCVm::Run(ABCVm* th) + assert_and_throw(th->ex); + + th->FPM=new llvm::FunctionPassManager(th->module); +-#ifdef HAVE_DATALAYOUT_H ++#if defined HAVE_DATALAYOUT_H || defined HAVE_IR_DATALAYOUT_H + th->FPM->add(new llvm::DataLayout(*th->ex->getDataLayout())); + #else + th->FPM->add(new llvm::TargetData(*th->ex->getTargetData())); +diff --git a/src/scripting/abc_codesynt.cpp b/src/scripting/abc_codesynt.cpp +index 2018be3..bb8e9a5 100644 +--- a/src/scripting/abc_codesynt.cpp ++++ b/src/scripting/abc_codesynt.cpp +@@ -25,18 +25,29 @@ + #endif + + #include "compat.h" +-#include +-#include + #include + #include +-#include +-#ifdef HAVE_IRBUILDER_H ++#ifdef HAVE_IR_DATALAYOUT_H ++# include ++# include ++# include ++# include ++#else ++# include ++# include ++# include ++# include ++#endif ++#ifdef HAVE_IR_DATALAYOUT_H ++# include ++#elif defined HAVE_IRBUILDER_H + # include + #else + # include + #endif +-#include +-#ifdef HAVE_DATALAYOUT_H ++#ifdef HAVE_IR_DATALAYOUT_H ++# include ++#elif defined HAVE_DATALAYOUT_H + # include + #else + # include +@@ -279,7 +290,7 @@ void ABCVm::registerFunctions() + llvm::FunctionType* FT=NULL; + + //Create types +-#ifdef HAVE_DATALAYOUT_H ++#if defined HAVE_DATALAYOUT_H || defined HAVE_IR_DATALAYOUT_H + ptr_type=ex->getDataLayout()->getIntPtrType(llvm_context()); + #else + ptr_type=ex->getTargetData()->getIntPtrType(llvm_context()); +-- +1.8.3 + diff --git a/srcpkgs/lightspark/patches/llvm32-irbuilder.patch b/srcpkgs/lightspark/patches/llvm32-irbuilder.patch deleted file mode 100644 index b569d925990..00000000000 --- a/srcpkgs/lightspark/patches/llvm32-irbuilder.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/conf/FindLLVM.cmake b/conf/FindLLVM.cmake -index 32d32b4..19a3934 100644 ---- a/conf/FindLLVM.cmake -+++ b/conf/FindLLVM.cmake -@@ -156,6 +156,15 @@ else (LLVM_INCLUDE_DIR) - IF(HAVE_SUPPORT_TARGETSELECT_H) - ADD_DEFINITIONS(-DHAVE_SUPPORT_TARGETSELECT_H) - ENDIF(HAVE_SUPPORT_TARGETSELECT_H) -+ -+ set(CMAKE_REQUIRED_INCLUDES ${LLVM_INCLUDE_DIR}) -+ set(CMAKE_REQUIRED_DEFINITIONS -D__STDC_LIMIT_MACROS=1 -D__STDC_CONSTANT_MACROS=1) -+ check_include_file_cxx("llvm/IRBuilder.h" HAVE_IRBUILDER_H) -+ unset(CMAKE_REQUIRED_INCLUDES) -+ MESSAGE(STATUS "HAVE_IRBUILDER_H: " ${HAVE_IRBUILDER_H}) -+ IF(HAVE_IRBUILDER_H) -+ ADD_DEFINITIONS(-DHAVE_IRBUILDER_H) -+ ENDIF(HAVE_IRBUILDER_H) - - exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --cxxflags OUTPUT_VARIABLE LLVM_COMPILE_FLAGS ) - MESSAGE(STATUS "LLVM CXX flags: " ${LLVM_COMPILE_FLAGS}) -diff --git a/src/scripting/abc_codesynt.cpp b/src/scripting/abc_codesynt.cpp -index d00521b..2648bbf 100644 ---- a/src/scripting/abc_codesynt.cpp -+++ b/src/scripting/abc_codesynt.cpp -@@ -29,8 +29,12 @@ - #include - #include - #include --#include --#include -+#include -+#ifdef HAVE_IRBUILDER_H -+# include -+#else -+# include -+#endif - #include - #include - #include diff --git a/srcpkgs/lightspark/patches/llvm32-targetdata.patch b/srcpkgs/lightspark/patches/llvm32-targetdata.patch deleted file mode 100644 index ff32a19531e..00000000000 --- a/srcpkgs/lightspark/patches/llvm32-targetdata.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/conf/FindLLVM.cmake b/conf/FindLLVM.cmake -index 19a3934..7bd52e2 100644 ---- a/conf/FindLLVM.cmake -+++ b/conf/FindLLVM.cmake -@@ -165,6 +165,14 @@ else (LLVM_INCLUDE_DIR) - IF(HAVE_IRBUILDER_H) - ADD_DEFINITIONS(-DHAVE_IRBUILDER_H) - ENDIF(HAVE_IRBUILDER_H) -+ -+ set(CMAKE_REQUIRED_INCLUDES ${LLVM_INCLUDE_DIR}) -+ check_include_file_cxx("llvm/DataLayout.h" HAVE_DATALAYOUT_H) -+ unset(CMAKE_REQUIRED_INCLUDES) -+ MESSAGE(STATUS "HAVE_DATALAYOUT_H: " ${HAVE_DATALAYOUT_H}) -+ IF(HAVE_DATALAYOUT_H) -+ ADD_DEFINITIONS(-DHAVE_DATALAYOUT_H) -+ ENDIF(HAVE_DATALAYOUT_H) - - exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --cxxflags OUTPUT_VARIABLE LLVM_COMPILE_FLAGS ) - MESSAGE(STATUS "LLVM CXX flags: " ${LLVM_COMPILE_FLAGS}) -diff --git a/src/scripting/abc.cpp b/src/scripting/abc.cpp -index 710eaec..a0546cb 100644 ---- a/src/scripting/abc.cpp -+++ b/src/scripting/abc.cpp -@@ -28,7 +28,11 @@ - #include - #include - #include --#include -+#ifdef HAVE_DATALAYOUT_H -+# include -+#else -+# include -+#endif - #ifdef HAVE_SUPPORT_TARGETSELECT_H - #include - #else -@@ -1456,7 +1460,11 @@ void ABCVm::Run(ABCVm* th) - assert_and_throw(th->ex); - - th->FPM=new llvm::FunctionPassManager(th->module); -+#ifdef HAVE_DATALAYOUT_H -+ th->FPM->add(new llvm::DataLayout(*th->ex->getDataLayout())); -+#else - th->FPM->add(new llvm::TargetData(*th->ex->getTargetData())); -+#endif - #ifdef EXPENSIVE_DEBUG - //This is pretty heavy, do not enable in release - th->FPM->add(llvm::createVerifierPass()); -diff --git a/src/scripting/abc_codesynt.cpp b/src/scripting/abc_codesynt.cpp -index 2648bbf..83c1d5f 100644 ---- a/src/scripting/abc_codesynt.cpp -+++ b/src/scripting/abc_codesynt.cpp -@@ -36,7 +36,11 @@ - # include - #endif - #include --#include -+#ifdef HAVE_DATALAYOUT_H -+# include -+#else -+# include -+#endif - #include - #include "scripting/abc.h" - #include "swftypes.h" -@@ -275,7 +279,11 @@ void ABCVm::registerFunctions() - llvm::FunctionType* FT=NULL; - - //Create types -+#ifdef HAVE_DATALAYOUT_H -+ ptr_type=ex->getDataLayout()->getIntPtrType(llvm_context()); -+#else - ptr_type=ex->getTargetData()->getIntPtrType(llvm_context()); -+#endif - //Pointer to 8 bit type, needed for pointer arithmetic - voidptr_type=llvm::IntegerType::get(getVm()->llvm_context(),8)->getPointerTo(); - number_type=llvm::Type::getDoubleTy(llvm_context()); diff --git a/srcpkgs/lightspark/template b/srcpkgs/lightspark/template index 437bfecba0d..528c742ed54 100644 --- a/srcpkgs/lightspark/template +++ b/srcpkgs/lightspark/template @@ -1,12 +1,13 @@ # Template file for 'lightspark' pkgname=lightspark -version=0.7.0 -revision=5 +version=0.7.2 +revision=2 patch_args="-Np1" build_style=cmake -configure_args="-DAUDIO_BACKEND=pulse -DENABLE_CURL=1 -DCOMPILE_PLUGIN=1" +configure_args="-DAUDIO_BACKEND=pulse -DENABLE_CURL=1 -DCOMPILE_PLUGIN=1 + -DCMAKE_SKIP_RPATH=OFF" makedepends="pkg-config cmake nasm pcre-devel>=8.30 libffi-devel libX11-devel - libpng-devel>=1.6 fontconfig-devel boost-devel SDL-devel ffmpeg-devel>=1.0.1 libcurl-devel + libpng-devel>=1.6 fontconfig-devel boost-devel SDL-devel ffmpeg-devel>=1.2 libcurl-devel MesaLib-devel ftgl-devel glew-devel>=1.9.0 libxml2-devel libxml++-devel glibmm-devel gtk+-devel libjpeg-turbo-devel pulseaudio-devel llvm>=3.2 librtmp-devel liblzma-devel" @@ -15,7 +16,7 @@ maintainer="Juan RP " homepage="http://lightspark.github.com/" license="LGPL-3" distfiles="http://launchpad.net/lightspark/trunk/$pkgname-$version/+download/$pkgname-$version.tar.gz" -checksum=f3df63692ad8409888336a58f4db96b3344737d492df3a3f06c7359fdf26c85b +checksum=70479bac90f3455a5ff6d0aaf6bccaedfbaac3c70bd602680f68ce75eab2dd1b lightspark_package() { conf_files="/etc/xdg/lightspark.conf" diff --git a/srcpkgs/nepomuk-core/template b/srcpkgs/nepomuk-core/template index 62013ec92ae..140e606167a 100644 --- a/srcpkgs/nepomuk-core/template +++ b/srcpkgs/nepomuk-core/template @@ -1,7 +1,7 @@ # Template file for 'nepomuk-core' pkgname=nepomuk-core version=4.10.4 -revision=2 +revision=3 short_desc="Networked Environment for Personalized, Ontology-based Management of Unified Knowledge" maintainer="Juan RP " license="GPL, LGPL, FDL" @@ -14,7 +14,7 @@ configure_args="-DKDE4_BUILD_TESTS=OFF -DSYSCONF_INSTALL_DIR=/etc" hostmakedepends="cmake automoc4 pkg-config" makedepends="qt-devel phonon-devel soprano-devel>=2.9.2_4 poppler-qt4-devel - ffmpeg-devel taglib-devel exiv2-devel kdelibs-devel>=${version}" + ffmpeg-devel>=1.2 taglib-devel exiv2-devel kdelibs-devel>=${version}" nepomuk-core-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/pidgin-otr/template b/srcpkgs/pidgin-otr/template new file mode 100644 index 00000000000..5a3e0870de9 --- /dev/null +++ b/srcpkgs/pidgin-otr/template @@ -0,0 +1,19 @@ +# Template file for 'pidgin-otr' +pkgname=pidgin-otr +version=4.0.0 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config intltool" +makedepends="pidgin-devel libgcrypt-devel libotr-devel" +short_desc="Off-the-Record Messaging plugin for Pidgin IM" +maintainer="Juan RP " +license="GPL-2" +homepage="http://www.cypherpunks.ca/otr/" +distfiles="http://www.cypherpunks.ca/otr/${pkgname}-${version}.tar.gz" +checksum=d56b3f092dbe9ee6597641c7d2dd294884dc04ba47aaf4ec571cd54977df4691 + +pidgin-otr_package() { + pkg_install() { + vmove all + } +} diff --git a/srcpkgs/vlc/patches/vaapi-0.34.patch b/srcpkgs/vlc/patches/vaapi-0.34.patch new file mode 100644 index 00000000000..8dd0953ff24 --- /dev/null +++ b/srcpkgs/vlc/patches/vaapi-0.34.patch @@ -0,0 +1,10 @@ +--- modules/codec/avcodec/vaapi.c.orig 2013-06-29 09:40:51.888595531 +0200 ++++ modules/codec/avcodec/vaapi.c 2013-06-29 09:41:02.216671144 +0200 +@@ -47,6 +47,7 @@ + + #include + #include ++#include + + typedef struct + { diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index ad4015c5cfd..6404b5f71bb 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,7 +1,7 @@ # Template file for 'vlc' pkgname=vlc version=2.0.7 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack --disable-telepathy --disable-lua --disable-live555 --disable-fluidsynth @@ -25,7 +25,7 @@ long_desc=" # XXX Add missing deps: gme, telepathy, lua, live555, libtar (for skins2). hostmakedepends="pkg-config" makedepends="videoproto libudev-devel>=183 libpng-devel>=1.6 - libvorbis-devel SDL_image-devel x264-devel ffmpeg-devel>=1.0.1 jack-devel + libvorbis-devel SDL_image-devel x264-devel ffmpeg-devel>=1.2 jack-devel xcb-util-devel>=0.3.9 xcb-util-keysyms-devel>=0.3.9 libsamplerate-devel libXxf86vm-devel libXinerama-devel libXpm-devel libXvMC-devel libXv-devel libmpeg2-devel libflac-devel>=1.3.0 fribidi-devel freetype-devel qt-devel