mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-15 07:19:02 +08:00
Merge branch 'testing' of gitorious.org:chakra-packages/platform into testing
This commit is contained in:
Bruce
commit
4bdb6c98d5
@ -1,19 +1,19 @@
|
||||
# Platform Packages for Chakra, part of chakra-project.org
|
||||
# maintainer abveritas@chakra-project.org
|
||||
# maintainer: Neophytos Kolokotronis <tetris4 AT gmail DOT com>
|
||||
# contributor: abveritas@chakra-project.org
|
||||
|
||||
pkgname=doxygen
|
||||
pkgver=1.8.3
|
||||
pkgver=1.8.5
|
||||
pkgrel=1
|
||||
pkgdesc="A documentation system for C++, C, Java, IDL and PHP"
|
||||
license=('GPL')
|
||||
arch=('x86_64')
|
||||
url="http://www.doxygen.org/"
|
||||
depends=('gcc-libs' 'qt')
|
||||
makedepends=('flex')
|
||||
depends=('gcc-libs')
|
||||
makedepends=('flex' 'qt' 'graphviz')
|
||||
optdepends=('graphviz: for caller/callee graph generation'
|
||||
'qt: for doxywizard')
|
||||
source=("ftp://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz")
|
||||
md5sums=('54245ba38a30f50fd7ae6e62fc05de15')
|
||||
md5sums=('db51274568755e2c75c2657e30a78a55')
|
||||
|
||||
build() {
|
||||
cd ${srcdir}/${pkgname}-${pkgver}
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
# maintainer abveritas@chakra-project.org
|
||||
# maintainer: Neophytos Kolokotronis <tetris4 AT gmail DOT com>
|
||||
# contributor: abveritas@chakra-project.org
|
||||
|
||||
pkgname=dssi
|
||||
pkgver=1.1.1
|
||||
pkgrel=8
|
||||
pkgrel=9
|
||||
pkgdesc="An API for audio plugins, with particular application for software synthesis plugins with native user interfaces."
|
||||
arch=("x86_64")
|
||||
url="http://dssi.sourceforge.net/"
|
||||
|
||||
@ -1,8 +1,11 @@
|
||||
# maintainer abveritas@chakra-project.org
|
||||
#
|
||||
# Platform Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# Maintainer: Francesco Marinucci < franzmari[at]chakra-project[dot]it>
|
||||
# contributor Jan de Groot <jgc@archlinux.org>
|
||||
|
||||
pkgname=gst-plugins-ugly
|
||||
pkgver=1.0.5
|
||||
pkgver=1.2.1
|
||||
pkgrel=1
|
||||
pkgdesc="GStreamer Multimedia Framework Ugly Plugins"
|
||||
arch=('x86_64')
|
||||
@ -12,7 +15,7 @@ depends=('gst-plugins-base' 'libdvdread' 'lame' 'libmpeg2' 'a52dec'
|
||||
'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
|
||||
options=(!libtool !emptydirs)
|
||||
source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
|
||||
md5sums=('cbad8e473023ef19c01a2edb744cb94a')
|
||||
md5sums=('553332a8d5153e788a6612642a57f416')
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
#
|
||||
# Platform Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer abveritas@chakra-project.org
|
||||
# maintainer franzmari@chakra-project.it
|
||||
|
||||
pkgbase=opencv
|
||||
pkgname=('opencv' 'opencv-samples')
|
||||
_realname=OpenCV
|
||||
pkgver=2.4.6.1
|
||||
pkgrel=3
|
||||
pkgver=2.4.7
|
||||
pkgrel=1
|
||||
pkgdesc="Open Source Computer Vision Library"
|
||||
arch=('x86_64')
|
||||
license=('BSD')
|
||||
@ -19,12 +19,10 @@ optdepends=('python-numpy: Python 2.x interface'
|
||||
'eigen')
|
||||
source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.tar.gz"
|
||||
'pkgconfig.patch'
|
||||
'fsh.patch'
|
||||
'cldetect.patch')
|
||||
sha1sums=('e015bd67218844b38daf3cea8aab505b592a66c0'
|
||||
'709a2fac455a00e0e8956ec8c8f109be88a083ff'
|
||||
'8d8c2ebccd8199fee2cf21b8dbbaadcc0a9f8bad'
|
||||
'5401c607287c10835fc95f490c294d4706399436')
|
||||
'fsh.patch')
|
||||
sha1sums=('67ec788943894d4be3dff6efd7720591108feb29'
|
||||
'c5202144d24671cbee411207d65b4ea05747b0f4'
|
||||
'e39a8f3f39298b2dcca604af95dee3e13689a55a')
|
||||
|
||||
_cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
|
||||
'-D CMAKE_INSTALL_PREFIX=/usr'
|
||||
@ -43,11 +41,6 @@ _cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
|
||||
prepare() {
|
||||
cd "$srcdir/$pkgname-$pkgver"
|
||||
|
||||
# fix missing opencl module
|
||||
# see https://bugs.archlinux.org/task/36076
|
||||
# and http://code.opencv.org/issues/3140
|
||||
patch -Np1 -i "$srcdir/cldetect.patch"
|
||||
|
||||
# fix pkg-config mess
|
||||
# see https://bugs.archlinux.org/task/32430
|
||||
# and http://code.opencv.org/issues/1925
|
||||
@ -57,9 +50,6 @@ prepare() {
|
||||
# see http://code.opencv.org/issues/2512
|
||||
patch -Np1 -i "$srcdir/fsh.patch"
|
||||
|
||||
# no longer including docs, see https://bugs.archlinux.org/task/34185
|
||||
# python2 compatibility for generating (html) docs
|
||||
#sed -i 's/sphinx-build/sphinx-build2/' cmake/OpenCVDetectPython.cmake
|
||||
}
|
||||
|
||||
build() {
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
diff -ur opencv-2.4.6.orig/cmake/OpenCVDetectOpenCL.cmake opencv-2.4.6/cmake/OpenCVDetectOpenCL.cmake
|
||||
--- opencv-2.4.6.orig/cmake/OpenCVDetectOpenCL.cmake 2013-07-11 18:57:27.363199736 +0000
|
||||
+++ opencv-2.4.6/cmake/OpenCVDetectOpenCL.cmake 2013-07-11 19:04:00.577069207 +0000
|
||||
@@ -17,8 +17,7 @@
|
||||
NAMES OpenCL/cl.h CL/cl.h
|
||||
HINTS ${OPENCL_ROOT_DIR}
|
||||
PATH_SUFFIXES include include/nvidia-current
|
||||
- DOC "OpenCL include directory"
|
||||
- NO_DEFAULT_PATH)
|
||||
+ DOC "OpenCL include directory")
|
||||
|
||||
if (X86_64)
|
||||
set(OPENCL_POSSIBLE_LIB_SUFFIXES lib/Win64 lib/x86_64 lib/x64)
|
||||
@@ -30,8 +29,7 @@
|
||||
NAMES OpenCL
|
||||
HINTS ${OPENCL_ROOT_DIR}
|
||||
PATH_SUFFIXES ${OPENCL_POSSIBLE_LIB_SUFFIXES}
|
||||
- DOC "OpenCL library"
|
||||
- NO_DEFAULT_PATH)
|
||||
+ DOC "OpenCL library")
|
||||
|
||||
mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY)
|
||||
include(FindPackageHandleStandardArgs)
|
||||
105
opencv/fsh.patch
105
opencv/fsh.patch
@ -1,7 +1,7 @@
|
||||
diff -Nbaur OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake
|
||||
--- OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake 2012-11-05 18:42:32.460958392 +0000
|
||||
+++ OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake 2012-11-05 18:52:43.766689315 +0000
|
||||
@@ -47,7 +47,7 @@
|
||||
diff -baur opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake
|
||||
--- opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake 2013-11-12 20:31:27.253763202 +0000
|
||||
+++ opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake 2013-11-12 20:31:54.923577113 +0000
|
||||
@@ -46,7 +46,7 @@
|
||||
|
||||
#need better solution....
|
||||
if(libpath MATCHES "3rdparty")
|
||||
@ -10,10 +10,22 @@ diff -Nbaur OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake OpenCV-2.4.3/cmake/
|
||||
else()
|
||||
set(installDir "${OPENCV_LIB_INSTALL_PATH}")
|
||||
endif()
|
||||
diff -Nbaur OpenCV-2.4.3.orig/CMakeLists.txt OpenCV-2.4.3/CMakeLists.txt
|
||||
--- OpenCV-2.4.3.orig/CMakeLists.txt 2012-11-05 18:42:32.700956757 +0000
|
||||
+++ OpenCV-2.4.3/CMakeLists.txt 2012-11-05 18:55:42.358787848 +0000
|
||||
@@ -221,9 +221,9 @@
|
||||
diff -baur opencv-2.4.7.orig/cmake/OpenCVModule.cmake opencv-2.4.7/cmake/OpenCVModule.cmake
|
||||
--- opencv-2.4.7.orig/cmake/OpenCVModule.cmake 2013-11-12 20:31:27.253763202 +0000
|
||||
+++ opencv-2.4.7/cmake/OpenCVModule.cmake 2013-11-12 20:35:37.805415871 +0000
|
||||
@@ -807,7 +807,7 @@
|
||||
if(INSTALL_C_EXAMPLES AND NOT WIN32 AND EXISTS "${samples_path}")
|
||||
file(GLOB sample_files "${samples_path}/*")
|
||||
install(FILES ${sample_files}
|
||||
- DESTINATION share/OpenCV/samples/${module_id}
|
||||
+ DESTINATION share/opencv/samples/${module_id}
|
||||
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
|
||||
endif()
|
||||
endfunction()
|
||||
diff -baur opencv-2.4.7.orig/CMakeLists.txt opencv-2.4.7/CMakeLists.txt
|
||||
--- opencv-2.4.7.orig/CMakeLists.txt 2013-11-12 20:31:27.437095684 +0000
|
||||
+++ opencv-2.4.7/CMakeLists.txt 2013-11-12 20:40:21.160171499 +0000
|
||||
@@ -243,9 +243,9 @@
|
||||
if(ANDROID OR WIN32)
|
||||
set(OPENCV_DOC_INSTALL_PATH doc)
|
||||
elseif(INSTALL_TO_MANGLED_PATHS)
|
||||
@ -24,16 +36,17 @@ diff -Nbaur OpenCV-2.4.3.orig/CMakeLists.txt OpenCV-2.4.3/CMakeLists.txt
|
||||
+ set(OPENCV_DOC_INSTALL_PATH share/doc/opencv)
|
||||
endif()
|
||||
|
||||
if(ANDROID)
|
||||
@@ -237,14 +237,14 @@
|
||||
set(LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/lib")
|
||||
set(3P_LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/3rdparty/lib${LIB_SUFFIX}")
|
||||
if(WIN32)
|
||||
@@ -282,7 +282,7 @@
|
||||
set(OPENCV_3P_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}staticlib${LIB_SUFFIX}")
|
||||
else()
|
||||
set(OPENCV_LIB_INSTALL_PATH lib${LIB_SUFFIX})
|
||||
- set(OPENCV_3P_LIB_INSTALL_PATH share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH})
|
||||
+ set(OPENCV_3P_LIB_INSTALL_PATH share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH})
|
||||
set(OPENCV_INCLUDE_INSTALL_PATH include)
|
||||
endif()
|
||||
set(OPENCV_INCLUDE_INSTALL_PATH "include")
|
||||
|
||||
math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
|
||||
@@ -290,7 +290,7 @@
|
||||
if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
|
||||
set(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/cmake/opencv)
|
||||
else()
|
||||
@ -42,9 +55,9 @@ diff -Nbaur OpenCV-2.4.3.orig/CMakeLists.txt OpenCV-2.4.3/CMakeLists.txt
|
||||
endif()
|
||||
endif()
|
||||
|
||||
diff -Nbaur OpenCV-2.4.3.orig/data/CMakeLists.txt OpenCV-2.4.3/data/CMakeLists.txt
|
||||
--- OpenCV-2.4.3.orig/data/CMakeLists.txt 2012-11-05 18:42:32.460958392 +0000
|
||||
+++ OpenCV-2.4.3/data/CMakeLists.txt 2012-11-05 18:52:43.816688977 +0000
|
||||
diff -baur opencv-2.4.7.orig/data/CMakeLists.txt opencv-2.4.7/data/CMakeLists.txt
|
||||
--- opencv-2.4.7.orig/data/CMakeLists.txt 2013-11-12 20:31:27.280430213 +0000
|
||||
+++ opencv-2.4.7/data/CMakeLists.txt 2013-11-12 20:31:54.923577113 +0000
|
||||
@@ -5,6 +5,6 @@
|
||||
install(FILES ${HAAR_CASCADES} DESTINATION sdk/etc/haarcascades COMPONENT main)
|
||||
install(FILES ${LBP_CASCADES} DESTINATION sdk/etc/lbpcascades COMPONENT main)
|
||||
@ -54,10 +67,22 @@ diff -Nbaur OpenCV-2.4.3.orig/data/CMakeLists.txt OpenCV-2.4.3/data/CMakeLists.t
|
||||
+ install(FILES ${HAAR_CASCADES} DESTINATION share/opencv/haarcascades COMPONENT main)
|
||||
+ install(FILES ${LBP_CASCADES} DESTINATION share/opencv/lbpcascades COMPONENT main)
|
||||
endif()
|
||||
diff -Nbaur OpenCV-2.4.3.orig/samples/c/CMakeLists.txt OpenCV-2.4.3/samples/c/CMakeLists.txt
|
||||
--- OpenCV-2.4.3.orig/samples/c/CMakeLists.txt 2012-11-05 18:42:32.697623446 +0000
|
||||
+++ OpenCV-2.4.3/samples/c/CMakeLists.txt 2012-11-05 18:52:43.826688906 +0000
|
||||
@@ -54,7 +54,7 @@
|
||||
diff -baur opencv-2.4.7.orig/modules/java/CMakeLists.txt opencv-2.4.7/modules/java/CMakeLists.txt
|
||||
--- opencv-2.4.7.orig/modules/java/CMakeLists.txt 2013-11-12 20:31:27.360429532 +0000
|
||||
+++ opencv-2.4.7/modules/java/CMakeLists.txt 2013-11-12 20:36:41.984985273 +0000
|
||||
@@ -279,7 +279,7 @@
|
||||
if(WIN32)
|
||||
set(JAR_INSTALL_DIR java)
|
||||
else(WIN32)
|
||||
- set(JAR_INSTALL_DIR share/OpenCV/java)
|
||||
+ set(JAR_INSTALL_DIR share/opencv/java)
|
||||
endif(WIN32)
|
||||
install(FILES ${JAR_FILE} DESTINATION ${JAR_INSTALL_DIR} COMPONENT main)
|
||||
endif(ANDROID)
|
||||
diff -baur opencv-2.4.7.orig/samples/c/CMakeLists.txt opencv-2.4.7/samples/c/CMakeLists.txt
|
||||
--- opencv-2.4.7.orig/samples/c/CMakeLists.txt 2013-11-12 20:31:27.433762373 +0000
|
||||
+++ opencv-2.4.7/samples/c/CMakeLists.txt 2013-11-12 20:31:54.923577113 +0000
|
||||
@@ -54,6 +54,6 @@
|
||||
if (INSTALL_C_EXAMPLES AND NOT WIN32)
|
||||
file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
|
||||
install(FILES ${C_SAMPLES}
|
||||
@ -65,11 +90,10 @@ diff -Nbaur OpenCV-2.4.3.orig/samples/c/CMakeLists.txt OpenCV-2.4.3/samples/c/CM
|
||||
+ DESTINATION share/opencv/samples/c
|
||||
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
|
||||
endif ()
|
||||
|
||||
diff -Nbaur OpenCV-2.4.3.orig/samples/cpp/CMakeLists.txt OpenCV-2.4.3/samples/cpp/CMakeLists.txt
|
||||
--- OpenCV-2.4.3.orig/samples/cpp/CMakeLists.txt 2012-11-05 18:42:32.677623583 +0000
|
||||
+++ OpenCV-2.4.3/samples/cpp/CMakeLists.txt 2012-11-05 18:52:43.823355598 +0000
|
||||
@@ -64,7 +64,7 @@
|
||||
diff -baur opencv-2.4.7.orig/samples/cpp/CMakeLists.txt opencv-2.4.7/samples/cpp/CMakeLists.txt
|
||||
--- opencv-2.4.7.orig/samples/cpp/CMakeLists.txt 2013-11-12 20:31:27.417095818 +0000
|
||||
+++ opencv-2.4.7/samples/cpp/CMakeLists.txt 2013-11-12 20:31:55.110242982 +0000
|
||||
@@ -83,6 +83,6 @@
|
||||
if (INSTALL_C_EXAMPLES AND NOT WIN32)
|
||||
file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
|
||||
install(FILES ${C_SAMPLES}
|
||||
@ -77,11 +101,10 @@ diff -Nbaur OpenCV-2.4.3.orig/samples/cpp/CMakeLists.txt OpenCV-2.4.3/samples/cp
|
||||
+ DESTINATION share/opencv/samples/cpp
|
||||
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
|
||||
endif()
|
||||
|
||||
diff -Nbaur OpenCV-2.4.3.orig/samples/gpu/CMakeLists.txt OpenCV-2.4.3/samples/gpu/CMakeLists.txt
|
||||
--- OpenCV-2.4.3.orig/samples/gpu/CMakeLists.txt 2012-11-05 18:42:32.670956962 +0000
|
||||
+++ OpenCV-2.4.3/samples/gpu/CMakeLists.txt 2012-11-05 18:52:43.820022288 +0000
|
||||
@@ -64,7 +64,7 @@
|
||||
diff -baur opencv-2.4.7.orig/samples/gpu/CMakeLists.txt opencv-2.4.7/samples/gpu/CMakeLists.txt
|
||||
--- opencv-2.4.7.orig/samples/gpu/CMakeLists.txt 2013-11-12 20:31:27.407095885 +0000
|
||||
+++ opencv-2.4.7/samples/gpu/CMakeLists.txt 2013-11-12 20:31:55.110242982 +0000
|
||||
@@ -83,6 +83,6 @@
|
||||
if (INSTALL_C_EXAMPLES AND NOT WIN32)
|
||||
file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
|
||||
install(FILES ${install_list}
|
||||
@ -89,11 +112,10 @@ diff -Nbaur OpenCV-2.4.3.orig/samples/gpu/CMakeLists.txt OpenCV-2.4.3/samples/gp
|
||||
+ DESTINATION share/opencv/samples/${project}
|
||||
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
|
||||
endif()
|
||||
|
||||
diff -Nbaur OpenCV-2.4.3.orig/samples/gpu/performance/CMakeLists.txt OpenCV-2.4.3/samples/gpu/performance/CMakeLists.txt
|
||||
--- OpenCV-2.4.3.orig/samples/gpu/performance/CMakeLists.txt 2012-11-05 18:42:32.674290272 +0000
|
||||
+++ OpenCV-2.4.3/samples/gpu/performance/CMakeLists.txt 2012-11-05 18:52:43.823355598 +0000
|
||||
@@ -21,6 +21,6 @@
|
||||
diff -baur opencv-2.4.7.orig/samples/gpu/performance/CMakeLists.txt opencv-2.4.7/samples/gpu/performance/CMakeLists.txt
|
||||
--- opencv-2.4.7.orig/samples/gpu/performance/CMakeLists.txt 2013-11-12 20:31:27.407095885 +0000
|
||||
+++ opencv-2.4.7/samples/gpu/performance/CMakeLists.txt 2013-11-12 20:31:55.110242982 +0000
|
||||
@@ -29,6 +29,6 @@
|
||||
if(INSTALL_C_EXAMPLES AND NOT WIN32)
|
||||
file(GLOB GPU_FILES performance/*.cpp performance/*.h)
|
||||
install(FILES ${GPU_FILES}
|
||||
@ -101,3 +123,14 @@ diff -Nbaur OpenCV-2.4.3.orig/samples/gpu/performance/CMakeLists.txt OpenCV-2.4.
|
||||
+ DESTINATION share/opencv/samples/gpu/performance
|
||||
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
|
||||
endif()
|
||||
diff -baur opencv-2.4.7.orig/samples/ocl/CMakeLists.txt opencv-2.4.7/samples/ocl/CMakeLists.txt
|
||||
--- opencv-2.4.7.orig/samples/ocl/CMakeLists.txt 2013-11-12 20:31:27.397095952 +0000
|
||||
+++ opencv-2.4.7/samples/ocl/CMakeLists.txt 2013-11-12 20:39:29.227200043 +0000
|
||||
@@ -54,6 +54,6 @@
|
||||
if (INSTALL_C_EXAMPLES AND NOT WIN32)
|
||||
file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
|
||||
install(FILES ${install_list}
|
||||
- DESTINATION share/OpenCV/samples/${project}
|
||||
+ DESTINATION share/opencv/samples/${project}
|
||||
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
|
||||
endif()
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -Nbaur OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake
|
||||
--- OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake 2012-11-04 08:40:14.243505926 +0000
|
||||
+++ OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake 2012-11-04 08:40:42.286649120 +0000
|
||||
diff -baur opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake
|
||||
--- opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake 2013-11-12 20:31:27.253763202 +0000
|
||||
+++ opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake 2013-11-12 20:41:48.936262732 +0000
|
||||
@@ -10,7 +10,7 @@
|
||||
# -------------------------------------------------------------------------------------------
|
||||
set(prefix "${CMAKE_INSTALL_PREFIX}")
|
||||
@ -8,9 +8,9 @@ diff -Nbaur OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake OpenCV-2.4.3/cmake/
|
||||
-set(libdir "") #TODO: need link paths for OpenCV_EXTRA_COMPONENTS
|
||||
+set(libdir "\${prefix}/${OPENCV_LIB_INSTALL_PATH}")
|
||||
set(includedir "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}")
|
||||
set(VERSION ${OPENCV_VERSION})
|
||||
|
||||
@@ -36,10 +36,11 @@
|
||||
if(CMAKE_BUILD_TYPE MATCHES "Release")
|
||||
@@ -35,10 +35,11 @@
|
||||
ocv_list_reverse(OpenCV_EXTRA_COMPONENTS)
|
||||
|
||||
#build the list of components
|
||||
@ -23,7 +23,7 @@ diff -Nbaur OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake OpenCV-2.4.3/cmake/
|
||||
|
||||
if(INSTALL_TO_MANGLED_PATHS)
|
||||
set(libname "${libname}.${OPENCV_VERSION}")
|
||||
@@ -52,7 +53,8 @@
|
||||
@@ -51,7 +52,8 @@
|
||||
set(installDir "${OPENCV_LIB_INSTALL_PATH}")
|
||||
endif()
|
||||
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
# Maintainer: abveritas@chakra-project.org
|
||||
# Maintainer: Neophytos Kolokotronis <tetris4 AT gmail DOT com>
|
||||
# Contributor: abveritas@chakra-project.org
|
||||
|
||||
pkgname=perl-module-build
|
||||
_pkgname=Module-Build
|
||||
pkgver=0.4003
|
||||
pkgver=0.4008
|
||||
pkgrel=1
|
||||
pkgdesc="Build and install Perl modules"
|
||||
arch=('x86_64')
|
||||
@ -11,7 +12,7 @@ url='http://search.cpan.org/dist/Module-Build'
|
||||
depends=('perl')
|
||||
options=('!emptydirs')
|
||||
source=("http://search.cpan.org/CPAN/authors/id/L/LE/LEONT/$_pkgname-$pkgver.tar.gz")
|
||||
md5sums=('ed5fe7e023af43b0722639b13ece8d2d')
|
||||
md5sums=('01675c01f6a42c528d02dc34cc5383bf')
|
||||
|
||||
build() {
|
||||
cd $_pkgname-$pkgver
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
# maintainer abveritas@chakra-project.org
|
||||
# Maintainer: Neophytos Kolokotronis <tetris4 AT gmail DOT com>
|
||||
# contributor: abveritas@chakra-project.org
|
||||
|
||||
pkgname=perl-sdl
|
||||
pkgver=2.540
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc="Simple DirectMedia Layer for Perl."
|
||||
arch=('x86_64')
|
||||
license=(LGPL)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user