Packaging: Fix spec file and update release version

 - Release version: 3.4.1
 - Rename license files

Change-Id: I2e7bffa99a034e120bcdb0b0cd368e8e159e8dce
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>

diff --git a/3rdparty/ffmpeg/license.txt b/3rdparty/ffmpeg/LICENSE.LGPL-2.1+
similarity index 100%
rename from 3rdparty/ffmpeg/license.txt
rename to 3rdparty/ffmpeg/LICENSE.LGPL-2.1+

diff --git a/packaging/opencv.spec b/packaging/opencv.spec
index 4aac5a6..0c90f77 100644 (file)
--- a/packaging/opencv.spec
+++ b/packaging/opencv.spec
@@ -1,31 +1,20 @@
 Name: opencv
-VCS:  #e3ca2f3bdcac02e9780c2de7001310a2a61a483e-dirty
 Summary: OpenCV library
-Version: 2.4.9
-Release: 18
+Version: 3.4.1
+Release: 1
 Group: Development/Libraries
 License: BSD-3-Clause and LGPL-2.1+
 Source0: %{name}-%{version}.tar.gz
+#Source100: opencv-contrib.tar.gz
 
+%if "%{_with_emulator}" != "1"
+BuildRequires:  mesa-devel
+%endif
 BuildRequires:  cmake
 BuildRequires:  pkg-config
 BuildRequires:  libjpeg-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
-#BuildRequires:  gettext-tools
-#BuildRequires:  edje-tools
-#BuildRequires:  eet-tools
-#BuildRequires:  eina-devel
-#BuildRequires:  eet-devel
-#BuildRequires:  evas-devel
-#BuildRequires:  ecore-devel
-#BuildRequires:  edje-devel
-#BuildRequires:  edbus-devel
-#BuildRequires:  efreet-devel
-#BuildRequires:  ethumb-devel
-#BuildRequires:  emotion-devel
-#BuildRequires:  app-svc-devel
-#BuildRequires:  libx11-devel
 BuildRequires:  elementary-devel
 BuildRequires:  gstreamer
 BuildRequires:  gst-plugins-base
@@ -34,7 +23,8 @@ BuildRequires:  libavutil-devel
 BuildRequires:  libavcodec-devel
 BuildRequires:  libavformat-devel
 BuildRequires:  libswscale-devel
-#BuildRequires:  gst-ffmpeg
+
+
 Requires(post):  /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -58,53 +48,73 @@ ARCH=aarch64
 %else
 ARCH=arm
 %endif
-
-cmake . -DCMAKE_INSTALL_PREFIX=/usr \
-    -DARCH=${ARCH} \
+mkdir -p build
+cd build
+cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
+       -DARCH=${ARCH} \
        -DCMAKE_BUILD_TYPE=Release \
        -DCMAKE_CONFIGURATION_TYPES=Release \
-       -DBUILD_DOCS=OFF \
-       -DBUILD_PACKAGE=OFF \
-       -DBUILD_ANDROID_SERVICE=OFF \
-       -DBUILD_ANDRIOD_PACKAGE=OFF \
-       -DBUILD_SHARED_LIBS=ON \
-       -DBUILD_JASPER=OFF \
-       -DBUILD_JPEG=OFF \
-       -DBUILD_PERF_TESTS=OFF \
-       -DBUILD_PNG=OFF \
-       -DBUILD_TESTS=OFF \
-       -DBUILD_TIFF=OFF \
-       -DBUILD_WITH_DEBUG_INFO=ON \
-       -DBUILD_ZLIB=OFF \
-       -DBUILD_OPENEXR=OFF \
-       -DBUILD_TBB=OFF \
-       -DBUILD_EXAMPLES=OFF \
-       -DBUILD_opencv_apps=OFF \
+       -DOPENCV_ENABLE_NONFREE=OFF \
+       -DBUILD_PROTOBUF=OFF \
+       -DPROTOBUF_UPDATE_FILES=OFF \
        -DBUILD_opencv_calib3d=ON \
-       -DBUILD_opencv_contrib=ON \
        -DBUILD_opencv_core=ON \
-       -DBUILD_opencv_imgproc=ON \
-       -DBUILD_opencv_flann=ON \
+       -DBUILD_opencv_dnn=OFF \
        -DBUILD_opencv_features2d=ON \
-       -DBUILD_opencv_objdetect=ON \
-       -DBUILD_opencv_ml=ON \
-       -DBUILD_opencv_gpu=OFF \
+       -DBUILD_opencv_flann=ON \
        -DBUILD_opencv_highgui=ON \
-       -DBUILD_opencv_legacy=ON \
-       -DBUILD_opencv_nonfree=OFF \
-       -DBUILD_opencv_ocl=OFF \
+       -DBUILD_opencv_imgcodecs=ON \
+       -DBUILD_opencv_imgproc=ON \
+       -DBUILD_opencv_ml=ON \
+       -DBUILD_opencv_objdetect=ON \
        -DBUILD_opencv_photo=ON \
+       -DBUILD_opencv_python2=OFF \
+       -DBUILD_opencv_python3=OFF \
+       -DBUILD_opencv_shape=OFF \
        -DBUILD_opencv_stitching=OFF \
        -DBUILD_opencv_superres=OFF \
        -DBUILD_opencv_ts=OFF \
        -DBUILD_opencv_video=ON \
+       -DBUILD_opencv_videoio=ON \
        -DBUILD_opencv_videostab=OFF \
        -DBUILD_opencv_world=OFF \
+       -DBUILD_opencv_python=OFF \
+       -DBUILD_opencv_viz=OFF \
+       -DBUILD_ZLIB=OFF \
+       -DBUILD_TIFF=OFF \
+       -DBUILD_JASPER=OFF \
+       -DBUILD_JPEG=OFF \
+       -DBUILD_PNG=OFF \
+       -DBUILD_WEBP=OFF \
+       -DBUILD_OPENEXR=OFF \
+       -DBUILD_TBB=OFF \
+       -DBUILD_SHARED_LIBS=ON \
+       -DBUILD_opencv_apps=OFF \
+       -DBUILD_opencv_js=OFF \
+       -DBUILD_DOCS=OFF \
+       -DBUILD_EXAMPLES=OFF \
+       -DBUILD_PACKAGE=OFF \
+       -DBUILD_PERF_TESTS=OFF \
+       -DBUILD_TESTS=OFF \
+       -DBUILD_WITH_DEBUG_INFO=ON \
+       -DBUILD_WITH_DYNAMIC_IPP=OFF \
+       -DBUILD_ANDROID_SERVICE=OFF \
+       -DBUILD_IPP_IW=OFF \
+       -DBUILD_ITT=OFF \
+       -DBUILD_WITH_STATIC_CRT=OFF \
+       -DBUILD_JAVA=OFF \
+       -DBUILD_opencv_java=OFF \
+       -DBUILD_FAT_JAVA_LIB=OFF \
+       -DBUILD_CUDA_STUBS=OFF \
+       -DWITH_CUDA=OFF \
+       -DWITH_CAROTENE=ON \
+       -DWITH_CPUFEATURES=OFF \
        -DWITH_1394=OFF \
        -DWITH_CSTRIPES=OFF \
-       -DWITH_CUBLAS=OFF \
        -DWITH_CUDA=OFF \
+       -DWITH_CUBLAS=OFF \
        -DWITH_CUFFT=OFF \
+       -DWITH_NVCUVID=OFF \
        -DWITH_DSHOW=OFF \
        -DWITH_EIGEN=OFF \
        -DWITH_FFMPEG=ON \
@@ -112,6 +122,7 @@ cmake . -DCMAKE_INSTALL_PREFIX=/usr \
        -DWITH_INTELPERC=OFF \
        -DWITH_IPP=OFF \
        -DWITH_JASPER=OFF \
+       -DWITH_WEBP=OFF \
        -DWITH_MSMF=OFF \
        -DWITH_NVCUVID=OFF \
        -DWITH_OPENCL=OFF \
@@ -121,6 +132,7 @@ cmake . -DCMAKE_INSTALL_PREFIX=/usr \
        -DWITH_OPENGL=ON \
        -DWITH_OPENMP=OFF \
        -DWITH_OPENNI=OFF \
+       -DWITH_JPEG=ON \
        -DWITH_PNG=ON \
        -DWITH_PVAPI=OFF \
        -DWITH_QT=OFF \
@@ -133,6 +145,12 @@ cmake . -DCMAKE_INSTALL_PREFIX=/usr \
        -DWITH_GSTREAMER=OFF \
        -DWITH_V4L=ON \
        -DWITH_GTK=ON \
+       -DWITH_MATLAB=OFF \
+       -DWITH_ITT=OFF \
+       -DWITH_GPHOTO2=OFF \
+       -DWITH_PTHREADS_PF=OFF \
+       -DWITH_LAPACK=OFF \
+       -DWITH_OPENVX=OFF \
        -DINSTALL_C_EXAMPLES=OFF \
        -DINSTALL_PYTHON_EXAMPLES=OFF \
        -DINSTALL_TESTS=OFF \
@@ -141,15 +159,16 @@ cmake . -DCMAKE_INSTALL_PREFIX=/usr \
        -DENABLE_DYNAMIC_CUDA=OFF \
        -DENABLE_SOLUTION_FOLDERS=OFF \
        -DENABLE_PROFILLING=OFF \
-       -DENABLE_COVERAGE=OFF
+       -DENABLE_COVERAGE=OFF \
+       -DCV_TRACE=OFF
 
 make %{?jobs:-j%jobs}
 
 %install
+cd build
 rm -rf %{buildroot}
 %make_install
 
-
 %clean
 rm -rf %{buildroot}
 
@@ -170,5 +189,4 @@ rm -rf %{buildroot}
 /usr/include/*
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/*.so
-
 %doc