pool/opencv
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
bbb57e2559
opencv/opencv-samples.patch

90 lines
3.8 KiB
Diff
Raw Normal View History

Accepting request 143632 from KDE:Distro:Factory Update to OpenCV 2.4.3 (forwarded request 143410 from koprok) OBS-URL: https://build.opensuse.org/request/show/143632 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=36
2012-11-30 12:26:16 +01:00
diff -urN OpenCV-2.4.3-orig/CMakeLists.txt OpenCV-2.4.3/CMakeLists.txt
--- OpenCV-2.4.3-orig/CMakeLists.txt 2012-11-02 17:04:07.000000000 +0200
+++ OpenCV-2.4.3/CMakeLists.txt 2012-11-28 12:01:07.942804657 +0200
@@ -455,7 +455,7 @@
Accepting request 121110 from KDE:Distro:Factory Update to OpenCV 2.4.0 (forwarded request 121099 from koprok) OBS-URL: https://build.opensuse.org/request/show/121110 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=31
2012-05-16 21:08:46 +02:00
add_subdirectory(apps)
Accepting request 79592 from KDE:Distro:Factory - Dropped opencv-2.3-ffmpeg.patch, applied upstream (forwarded request 79589 from koprok) OBS-URL: https://build.opensuse.org/request/show/79592 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=23
2011-08-24 14:04:40 +02:00
Accepting request 121110 from KDE:Distro:Factory Update to OpenCV 2.4.0 (forwarded request 121099 from koprok) OBS-URL: https://build.opensuse.org/request/show/121110 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=31
2012-05-16 21:08:46 +02:00
# examples
Accepting request 79592 from KDE:Distro:Factory - Dropped opencv-2.3-ffmpeg.patch, applied upstream (forwarded request 79589 from koprok) OBS-URL: https://build.opensuse.org/request/show/79592 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=23
2011-08-24 14:04:40 +02:00
-if(BUILD_EXAMPLES OR BUILD_ANDROID_EXAMPLES OR INSTALL_PYTHON_EXAMPLES)
+if(BUILD_EXAMPLES OR INSTALL_C_EXAMPLES OR BUILD_ANDROID_EXAMPLES OR INSTALL_PYTHON_EXAMPLES)
Accepting request 121110 from KDE:Distro:Factory Update to OpenCV 2.4.0 (forwarded request 121099 from koprok) OBS-URL: https://build.opensuse.org/request/show/121110 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=31
2012-05-16 21:08:46 +02:00
add_subdirectory(samples)
Accepting request 79592 from KDE:Distro:Factory - Dropped opencv-2.3-ffmpeg.patch, applied upstream (forwarded request 79589 from koprok) OBS-URL: https://build.opensuse.org/request/show/79592 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=23
2011-08-24 14:04:40 +02:00
endif()
Accepting request 143632 from KDE:Distro:Factory Update to OpenCV 2.4.3 (forwarded request 143410 from koprok) OBS-URL: https://build.opensuse.org/request/show/143632 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=36
2012-11-30 12:26:16 +01:00
diff -urN OpenCV-2.4.3-orig/samples/CMakeLists.txt OpenCV-2.4.3/samples/CMakeLists.txt
--- OpenCV-2.4.3-orig/samples/CMakeLists.txt 2012-08-09 01:55:05.000000000 +0300
+++ OpenCV-2.4.3/samples/CMakeLists.txt 2012-11-28 12:01:07.943804624 +0200
Accepting request 121110 from KDE:Distro:Factory Update to OpenCV 2.4.0 (forwarded request 121099 from koprok) OBS-URL: https://build.opensuse.org/request/show/121110 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=31
2012-05-16 21:08:46 +02:00
@@ -3,6 +3,7 @@
Accepting request 79592 from KDE:Distro:Factory - Dropped opencv-2.3-ffmpeg.patch, applied upstream (forwarded request 79589 from koprok) OBS-URL: https://build.opensuse.org/request/show/79592 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=23
2011-08-24 14:04:40 +02:00
#
# ----------------------------------------------------------------------------
+if(BUILD_EXAMPLES OR INSTALL_C_EXAMPLES)
add_subdirectory(c)
add_subdirectory(cpp)
Accepting request 121110 from KDE:Distro:Factory Update to OpenCV 2.4.0 (forwarded request 121099 from koprok) OBS-URL: https://build.opensuse.org/request/show/121110 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=31
2012-05-16 21:08:46 +02:00
add_subdirectory(gpu)
Accepting request 143632 from KDE:Distro:Factory Update to OpenCV 2.4.3 (forwarded request 143410 from koprok) OBS-URL: https://build.opensuse.org/request/show/143632 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=36
2012-11-30 12:26:16 +01:00
@@ -11,3 +12,9 @@
Accepting request 121110 from KDE:Distro:Factory Update to OpenCV 2.4.0 (forwarded request 121099 from koprok) OBS-URL: https://build.opensuse.org/request/show/121110 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=31
2012-05-16 21:08:46 +02:00
if(ANDROID AND BUILD_ANDROID_EXAMPLES)
add_subdirectory(android)
Accepting request 79592 from KDE:Distro:Factory - Dropped opencv-2.3-ffmpeg.patch, applied upstream (forwarded request 79589 from koprok) OBS-URL: https://build.opensuse.org/request/show/79592 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=23
2011-08-24 14:04:40 +02:00
endif()
+endif()
+
Accepting request 121110 from KDE:Distro:Factory Update to OpenCV 2.4.0 (forwarded request 121099 from koprok) OBS-URL: https://build.opensuse.org/request/show/121110 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=31
2012-05-16 21:08:46 +02:00
+if(INSTALL_PYTHON_EXAMPLES)
Accepting request 79592 from KDE:Distro:Factory - Dropped opencv-2.3-ffmpeg.patch, applied upstream (forwarded request 79589 from koprok) OBS-URL: https://build.opensuse.org/request/show/79592 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=23
2011-08-24 14:04:40 +02:00
+add_subdirectory(python)
+add_subdirectory(python2)
+endif()
Accepting request 143632 from KDE:Distro:Factory Update to OpenCV 2.4.3 (forwarded request 143410 from koprok) OBS-URL: https://build.opensuse.org/request/show/143632 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=36
2012-11-30 12:26:16 +01:00
diff -urN 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-10-18 01:55:38.000000000 +0300
+++ OpenCV-2.4.3/samples/gpu/CMakeLists.txt 2012-11-28 12:01:07.943804624 +0200
Accepting request 121110 from KDE:Distro:Factory Update to OpenCV 2.4.0 (forwarded request 121099 from koprok) OBS-URL: https://build.opensuse.org/request/show/121110 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=31
2012-05-16 21:08:46 +02:00
@@ -64,7 +64,7 @@
Accepting request 143632 from KDE:Distro:Factory Update to OpenCV 2.4.3 (forwarded request 143410 from koprok) OBS-URL: https://build.opensuse.org/request/show/143632 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=36
2012-11-30 12:26:16 +01:00
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/gpu
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
endif()
diff -urN OpenCV-2.4.3-orig/samples/ocl/CMakeLists.txt OpenCV-2.4.3/samples/ocl/CMakeLists.txt
--- OpenCV-2.4.3-orig/samples/ocl/CMakeLists.txt 2012-10-18 01:55:38.000000000 +0300
+++ OpenCV-2.4.3/samples/ocl/CMakeLists.txt 2012-11-28 13:16:24.943465391 +0200
@@ -58,7 +58,7 @@
if (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/ocl
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
endif()
diff -urN OpenCV-2.4.3-orig/samples/python/CMakeLists.txt OpenCV-2.4.3/samples/python/CMakeLists.txt
--- OpenCV-2.4.3-orig/samples/python/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200
+++ OpenCV-2.4.3/samples/python/CMakeLists.txt 2012-11-28 12:01:07.943804624 +0200
Accepting request 79592 from KDE:Distro:Factory - Dropped opencv-2.3-ffmpeg.patch, applied upstream (forwarded request 79589 from koprok) OBS-URL: https://build.opensuse.org/request/show/79592 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=23
2011-08-24 14:04:40 +02:00
@@ -0,0 +1,12 @@
+# -------------------------------------------------------------------------
+# CMake file for Python samples. See root CMakeLists.txt
+# -------------------------------------------------------------------------
+
+file(GLOB PYTHON_SAMPLES *.py)
+if(NOT WIN32)
+install(FILES ${PYTHON_SAMPLES}
Accepting request 127826 from KDE:Distro:Factory Update to OpenCV 2.4.2 (forwarded request 127177 from koprok) OBS-URL: https://build.opensuse.org/request/show/127826 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=34
2012-07-22 15:17:05 +02:00
+ DESTINATION share/OpenCV/samples/python
Accepting request 79592 from KDE:Distro:Factory - Dropped opencv-2.3-ffmpeg.patch, applied upstream (forwarded request 79589 from koprok) OBS-URL: https://build.opensuse.org/request/show/79592 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=23
2011-08-24 14:04:40 +02:00
+ PERMISSIONS OWNER_READ OWNER_EXECUTE
+ GROUP_READ GROUP_EXECUTE
+ WORLD_READ WORLD_EXECUTE)
+endif()
Accepting request 143632 from KDE:Distro:Factory Update to OpenCV 2.4.3 (forwarded request 143410 from koprok) OBS-URL: https://build.opensuse.org/request/show/143632 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=36
2012-11-30 12:26:16 +01:00
diff -urN OpenCV-2.4.3-orig/samples/python2/CMakeLists.txt OpenCV-2.4.3/samples/python2/CMakeLists.txt
--- OpenCV-2.4.3-orig/samples/python2/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200
+++ OpenCV-2.4.3/samples/python2/CMakeLists.txt 2012-11-28 12:01:07.943804624 +0200
Accepting request 79592 from KDE:Distro:Factory - Dropped opencv-2.3-ffmpeg.patch, applied upstream (forwarded request 79589 from koprok) OBS-URL: https://build.opensuse.org/request/show/79592 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=23
2011-08-24 14:04:40 +02:00
@@ -0,0 +1,12 @@
+# -------------------------------------------------------------------------
+# CMake file for Python samples. See root CMakeLists.txt
+# -------------------------------------------------------------------------
+
+file(GLOB PYTHON_SAMPLES *.py)
+if(NOT WIN32)
+install(FILES ${PYTHON_SAMPLES}
Accepting request 127826 from KDE:Distro:Factory Update to OpenCV 2.4.2 (forwarded request 127177 from koprok) OBS-URL: https://build.opensuse.org/request/show/127826 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=34
2012-07-22 15:17:05 +02:00
+ DESTINATION share/OpenCV/samples/python2
Accepting request 79592 from KDE:Distro:Factory - Dropped opencv-2.3-ffmpeg.patch, applied upstream (forwarded request 79589 from koprok) OBS-URL: https://build.opensuse.org/request/show/79592 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=23
2011-08-24 14:04:40 +02:00
+ PERMISSIONS OWNER_READ OWNER_EXECUTE
+ GROUP_READ GROUP_EXECUTE
+ WORLD_READ WORLD_EXECUTE)
+endif()
Reference in New Issue Copy Permalink