- new URLs, updated to latest snap (version [0.]1788)

- updated shared-lib patch, soname changed (ARGBRotate{90,180,270} symbols removed)
- now static and shared libs are both built

diff --git a/gclient.conf b/gclient.conf
deleted file mode 100644 (file)
index a7b4487..0000000
--- a/gclient.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-solutions = [
-  { "name"        : "libyuv",
-    "url"         : "http://libyuv.googlecode.com/svn/trunk",
-    "deps_file"   : "DEPS",
-    "managed"     : True,
-    "custom_deps" : {
-               # don't need gold binaries here
-               "libyuv/third_party/gold": None,
-               # using system libjpeg
-               "libyuv/third_party/libjpeg_turbo": None,
-               # yasm assember required for libjpeg_turbo only
-               "libyuv/yasm": None
-    },
-    "safesync_url": "",
-  },
-]

diff --git a/get-source.sh b/get-source.sh
deleted file mode 100755 (executable)
index 070ba57..0000000
--- a/get-source.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-# Make snapshot of libyuv
-# Author: Elan Ruusamäe <glen@pld-linux.org>
-set -e
-
-package=libyuv
-specfile=$package.spec
-baseurl=http://$package.googlecode.com/svn
-svnurl=$baseurl/trunk
-release_dir=$package-$(date +%Y%m%d)
-tarball=$release_dir.tar.xz
-
-# get depot tools
-# http://www.chromium.org/developers/how-tos/install-depot-tools
-test -d depot_tools || {
-       # could also checkout:
-       # svn co http://src.chromium.org/svn/trunk/tools/depot_tools
-       wget -c https://src.chromium.org/svn/trunk/tools/depot_tools.zip
-       unzip -qq depot_tools.zip
-       chmod a+x depot_tools/gclient depot_tools/update_depot_tools
-}
-
-topdir=${PWD:-($pwd)}
-gclient=$topdir/gclient.conf
-install -d $package
-cd $package
-
-if [ ! -f $gclient ]; then
-       # create initial config that can be later modified
-       ../depot_tools/gclient config $svnurl --gclientfile=$gclient
-fi
-
-cp -p $gclient .gclient
-
-# emulate gclient config, preserving our deps
-sed -i -re '/"url"/ s,"http[^"]+","'$svnurl'",' .gclient
-
-../depot_tools/gclient sync --nohooks -v
-
-cd ..
-
-cp -al $package $release_dir
-XZ_OPT=-e9 tar -caf $tarball --exclude-vcs $release_dir
-rm -rf $release_dir
-
-../md5 $specfile
-../dropin $tarball &

diff --git a/libyuv.spec b/libyuv.spec
index 14efa723d9e59424588188bab247e2dc1f324692..aa2745205625b9eac2b91ebb1c8b0a2c8506115e 100644 (file)
--- a/libyuv.spec
+++ b/libyuv.spec
@@ -1,23 +1,25 @@
 #
 # Conditional build:
-%bcond_without tests           # build without tests
+%bcond_without tests           # unit tests
 
-%define        svnver  1325
 Summary:       YUV conversion and scaling functionality library
 Summary(pl.UTF-8):     Biblioteka do konwersji i skalowania YUV
 Name:          libyuv
-Version:       0.%{svnver}
-Release:       3
+# see include/libyuv/version.h
+%define        yuv_ver 1788
+%define        gitref  d19f69d9df7a54eae9cfae0b650921f675d9f01a
+%define        snap    20210611
+%define        rel     1
+Version:       0.%{yuv_ver}
+Release:       0.%{snap}.%{rel}
 License:       BSD
 Group:         Development/Libraries
-## svn -r 1325 export http://libyuv.googlecode.com/svn/trunk libyuv
-## tar -cJf libyuv-svn1325.tar.bz2 --exclude-vcs libyuv
-Source0:       %{name}-svn%{svnver}.tar.xz
-# Source0-md5: f18002950f43df0d168fbf8fcb5fc9c1
+Source0:       https://chromium.googlesource.com/libyuv/libyuv/+archive/%{gitref}.tar.gz?/%{name}-%{snap}.tar.gz
+# Source0-md5: 9783a72e05ef548dd6f6ff7c1775e744
 Source1:       %{name}.pc
 Patch0:                shared-lib.patch
-URL:           http://code.google.com/p/libyuv/
-BuildRequires: cmake
+URL:           https://chromium.googlesource.com/libyuv/libyuv
+BuildRequires: cmake >= 2.8
 %{?with_tests:BuildRequires:   gtest-devel}
 BuildRequires: libjpeg-devel
 BuildRequires: libstdc++-devel
@@ -45,7 +47,6 @@ Summary:      The development files for libyuv
 Summary(pl.UTF-8):     Pliki programistyczne libyuv
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Obsoletes:     libyuv-static
 
 %description devel
 Header files for development with libyuv.
@@ -53,8 +54,20 @@ Header files for development with libyuv.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe do tworzenia programów z użyciem libyuv.
 
+%package static
+Summary:       Static libyuv library
+Summary(pl.UTF-8):     Statyczna biblioteka libyuv
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+
+%description static
+Static libyuv library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka libyuv.
+
 %prep
-%setup -q -n %{name}
+%setup -q -c
 %patch0 -p1
 
 %build
@@ -64,6 +77,7 @@ cd build
        %{?with_tests:-DTEST=ON}
 
 %{__make}
+
 %{?with_tests:./libyuv_unittest}
 
 %install
@@ -74,7 +88,7 @@ cd build
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__sed} -e 's|@PACKAGE_VERSION@|%{svnver}|' \
+%{__sed} -e 's|@PACKAGE_VERSION@|%{yuv_ver}|' \
        -e 's|@prefix@|%{_prefix}|' \
        -e 's|@exec_prefix@|%{_prefix}|' \
        -e 's|@libdir@|%{_libdir}|' \
@@ -89,8 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS LICENSE PATENTS
-%attr(755,root,root) %{_libdir}/libyuv.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libyuv.so.1
+%attr(755,root,root) %{_bindir}/yuvconvert
+%attr(755,root,root) %{_libdir}/libyuv.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libyuv.so.2
 
 %files devel
 %defattr(644,root,root,755)
@@ -98,3 +113,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libyuv.h
 %{_includedir}/libyuv
 %{_pkgconfigdir}/libyuv.pc
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libyuv.a

diff --git a/shared-lib.patch b/shared-lib.patch
index 41158cbe08d05fe066aaa2ed1d5d62bd632a01b3..c6401c4a78d0a0d2f9081804334a57a6a7d5e4db 100644 (file)
--- a/shared-lib.patch
+++ b/shared-lib.patch
@@ -1,28 +1,29 @@
---- libyuv/CMakeLists.txt.orig 2015-03-15 11:25:05.195695761 +0100
-+++ libyuv/CMakeLists.txt      2015-03-15 11:23:31.625695127 +0100
-@@ -86,7 +86,8 @@
+--- libyuv-0.1788/CMakeLists.txt.orig  2021-06-28 18:35:26.772881431 +0200
++++ libyuv-0.1788/CMakeLists.txt       2021-06-28 18:44:58.326451726 +0200
+@@ -29,6 +29,7 @@
+ ADD_LIBRARY                           ( ${ly_lib_shared} SHARED ${ly_source_files} )
+ SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES OUTPUT_NAME "${ly_lib_name}" )
+ SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES PREFIX "lib" )
++SET_TARGET_PROPERTIES   ( ${ly_lib_shared} PROPERTIES VERSION 2.1755 SOVERSION 2 )
  
- include_directories(${ly_inc_dir})
- 
--add_library(${ly_lib_name} STATIC ${ly_source_files})
-+add_library(${ly_lib_name} ${ly_source_files})
-+set_target_properties(${ly_lib_name} PROPERTIES VERSION 1.0.0 SOVERSION 1)
- 
- add_executable(convert ${ly_base_dir}/util/convert.cc)
- target_link_libraries(convert ${ly_lib_name})
-@@ -96,6 +96,7 @@
+ # this creates the conversion tool
+ ADD_EXECUTABLE                        ( yuvconvert ${ly_base_dir}/util/yuvconvert.cc )
+@@ -39,6 +40,7 @@
  if (JPEG_FOUND)
-   include_directories(${JPEG_INCLUDE_DIR})
-   target_link_libraries(convert ${JPEG_LIBRARY})
-+  target_link_libraries(${ly_lib_name} ${JPEG_LIBRARY})
-   add_definitions(-DHAVE_JPEG)
+   include_directories( ${JPEG_INCLUDE_DIR} )
+   target_link_libraries( yuvconvert ${JPEG_LIBRARY} )
++  target_link_libraries( ${ly_lib_shared} ${JPEG_LIBRARY} )
+   add_definitions( -DHAVE_JPEG )
  endif()
  
-@@ -126,6 +126,6 @@
-   target_link_libraries(libyuv_unittest glibc-compat)
- endif()
+@@ -76,8 +78,8 @@
+ 
+ # install the conversion tool, .so, .a, and all the header files
+ INSTALL ( PROGRAMS ${CMAKE_BINARY_DIR}/yuvconvert                     DESTINATION bin )
+-INSTALL ( TARGETS ${ly_lib_static}                                            DESTINATION lib )
+-INSTALL ( TARGETS ${ly_lib_shared} LIBRARY                            DESTINATION lib RUNTIME DESTINATION bin )
++INSTALL ( TARGETS ${ly_lib_static}                                            DESTINATION ${CMAKE_INSTALL_LIBDIR} )
++INSTALL ( TARGETS ${ly_lib_shared} LIBRARY                            DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION bin )
+ INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR}/include/            DESTINATION include )
  
--install(TARGETS ${ly_lib_name} DESTINATION lib)
-+install(TARGETS ${ly_lib_name} DESTINATION ${CMAKE_INSTALL_LIBDIR})
- install(FILES ${ly_header_files} DESTINATION include/libyuv)
- install(FILES ${ly_inc_dir}/libyuv.h DESTINATION include/)
+ # create the .deb and .rpm packages using cpack