Skip to content

Commit

Permalink
libyuv-0.0.1880
Browse files Browse the repository at this point in the history
  • Loading branch information
fd00 committed Dec 3, 2023
1 parent 9765a31 commit e980e57
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 61 deletions.
45 changes: 24 additions & 21 deletions libyuv/README
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,24 @@ devices in portrait mode. Scale YUV to prepare content for compression, with
point, bilinear or box filter.

Runtime requirements:
cygwin-3.3.4-2
libgcc1-11.2.0-1
libjpeg8-2.1.3-1
libstdc++6-11.2.0-1
libyuv-devel-0.0.1822-1bl1
libyuv0-0.0.1822-1bl1
pkg-config-1.8.0-1
cygwin-3.5.0-0.494.gcb21f8bc56c2
libgcc1-11.4.0-1
libjpeg8-2.1.5.1-1
libstdc++6-11.4.0-1
libyuv-devel-0.0.1880-1bl1
libyuv0-0.0.1880-1bl1
pkg-config-2.1.0-1

Build requirements:
(besides corresponding -devel packages)
binutils-2.37-2
cmake-3.20.0-1
cygport-0.34.2-1
gcc-core-11.2.0-1
gcc-g++-11.2.0-1
libgtest-devel-1.11.0-1bl1
libjpeg-devel-2.1.3-1
ninja-1.10.2-1
binutils-2.41-3
cmake-3.25.3-1
cygport-0.36.7-1
gcc-core-11.4.0-1
gcc-g++-11.4.0-1
libgtest-devel-1.14.0-1bl1
libjpeg-devel-2.1.5.1-1
ninja-1.11.1-1

Canonical website:
https://chromium.googlesource.com/libyuv/libyuv/
Expand All @@ -35,17 +35,17 @@ Canonical download:
-------------------------------------------

Build instructions:
1. unpack libyuv-0.0.1822-X-src.tar.xz
1. unpack libyuv-0.0.1880-X-src.tar.xz
2. if you use setup to install this src package,
it will be unpacked under /usr/src automatically
% cd /usr/src
% cygport ./libyuv-0.0.1822-X.cygport all
% cygport ./libyuv-0.0.1880-X.cygport all

This will create:
/usr/src/libyuv-0.0.1822-X-src.tar.xz
/usr/src/libyuv-0.0.1822-X.tar.xz
/usr/src/libyuv0-0.0.1822-X.tar.xz
/usr/src/libyuv-devel-0.0.1822-X.tar.xz
/usr/src/libyuv-0.0.1880-X-src.tar.xz
/usr/src/libyuv-0.0.1880-X.tar.xz
/usr/src/libyuv0-0.0.1880-X.tar.xz
/usr/src/libyuv-devel-0.0.1880-X.tar.xz

-------------------------------------------

Expand Down Expand Up @@ -100,6 +100,9 @@ Files included in the binary package:

Port Notes:

----- version 0.0.1880-1bl1 -----
Version bump.

----- version 0.0.1822-1bl1 -----
Version bump.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
HOMEPAGE="https://chromium.googlesource.com/${PN}/${PN}/"
GIT_URI="https://chromium.googlesource.com/${PN}/${PN}/"
GIT_BRANCH="main"
GIT_REV="e6d5adb3629a4aedb385f948fc5a8eb379a5ca3b"

CATEGORY="Libs"
SUMMARY="YUV conversion and scaling functionality"
Expand All @@ -10,16 +10,20 @@ formats for rendering/effects. Rotate by 90 degrees to adjust for mobile
devices in portrait mode. Scale YUV to prepare content for compression, with
point, bilinear or box filter."

LICENSE="BSD-3-Clause"
LICENSE_SPDX="SPDX-License-Identifier: BSD-3-Clause"
LICENSE_URI="LICENSE"

BUILD_REQUIRES="libgtest-devel libjpeg-devel"

export CXXFLAGS="`echo ${CXXFLAGS} | sed -e 's/-ggdb//'` -Wa,-mbig-obj"
export CXXFLAGS="${CXXFLAGS//-ggdb/} -Wa,-mbig-obj"

inherit cmake
inherit git

CYGCMAKE_ARGS="
-DSOVERSION:STRING=${PV[1]}
-DTEST:BOOL=ON
-DUNIT_TEST:BOOL=ON
"

src_test()
Expand All @@ -43,7 +47,7 @@ libyuv_CONTENTS="
usr/share
"
libyuv0_CONTENTS="
usr/bin/*.dll
usr/bin/cyg*-0.dll
"
libyuv_devel_CONTENTS="
usr/include
Expand Down
Original file line number Diff line number Diff line change
@@ -1,40 +1,39 @@
--- origsrc/libyuv/CMakeLists.txt 2022-04-25 16:24:02.000000000 +0900
+++ src/libyuv/CMakeLists.txt 2022-04-25 16:26:40.136057700 +0900
@@ -23,16 +23,22 @@ LIST ( SORT ly_unittest_sources )
INCLUDE_DIRECTORIES( BEFORE ${ly_inc_dir} )
--- origsrc/libyuv/CMakeLists.txt 2023-12-03 12:04:10.000000000 +0900
+++ src/libyuv/CMakeLists.txt 2023-12-03 14:24:31.087808500 +0900
@@ -26,24 +26,26 @@ if(MSVC)
ADD_DEFINITIONS ( -D_CRT_SECURE_NO_WARNINGS )
endif()

# this creates the static library (.a)
-# this creates the static library (.a)
-ADD_LIBRARY ( ${ly_lib_static} STATIC ${ly_source_files} )
+if (NOT CYGWIN)
+ ADD_LIBRARY ( ${ly_lib_static} STATIC ${ly_source_files} )
+endif()

-
# this creates the shared library (.so)
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" )
+if (CYGWIN)
+ SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES SOVERSION "${SOVERSION}" )
+else()
+if (NOT CYGWIN)
+ SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES PREFIX "lib" )
+endif()
if(WIN32)
SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES IMPORT_PREFIX "lib" )
endif()
+if (DEFINED SOVERSION)
+ set_target_properties(${ly_lib_shared} PROPERTIES SOVERSION "${SOVERSION}")
+endif()

# this creates the conversion tool
ADD_EXECUTABLE ( yuvconvert ${ly_base_dir}/util/yuvconvert.cc )
-TARGET_LINK_LIBRARIES ( yuvconvert ${ly_lib_static} )
+TARGET_LINK_LIBRARIES ( yuvconvert ${ly_lib_shared} )

# this creates the yuvconstants tool
ADD_EXECUTABLE ( yuvconstants ${ly_base_dir}/util/yuvconstants.c )
-TARGET_LINK_LIBRARIES ( yuvconstants ${ly_lib_static} )
+TARGET_LINK_LIBRARIES ( yuvconstants ${ly_lib_shared} )

INCLUDE ( FindJPEG )
@@ -40,6 +46,7 @@ if (JPEG_FOUND)
include_directories( ${JPEG_INCLUDE_DIR} )
target_link_libraries( yuvconvert ${JPEG_LIBRARY} )
add_definitions( -DHAVE_JPEG )
+ target_link_libraries( ${ly_lib_shared} ${JPEG_LIBRARY} )
endif()

if(TEST)
@@ -59,7 +66,7 @@ if(TEST)
find_package ( JPEG )
if (JPEG_FOUND)
@@ -72,7 +74,7 @@ if(UNIT_TEST)
endif()

add_executable(libyuv_unittest ${ly_unittest_sources})
Expand All @@ -43,31 +42,26 @@
find_library(PTHREAD_LIBRARY pthread)
if(NOT PTHREAD_LIBRARY STREQUAL "PTHREAD_LIBRARY-NOTFOUND")
target_link_libraries(libyuv_unittest pthread)
@@ -76,10 +83,20 @@ endif()
@@ -95,10 +97,15 @@ endif()

# 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 )
+if (NOT CYGWIN)
+ INSTALL ( TARGETS ${ly_lib_static} DESTINATION lib )
+endif()
+INSTALL ( TARGETS ${ly_lib_shared} ARCHIVE DESTINATION lib RUNTIME DESTINATION bin )
+INSTALL ( TARGETS ${ly_lib_shared} ARCHIVE DESTINATION lib RUNTIME DESTINATION bin )
INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION include )

# create the .deb and .rpm packages using cpack
INCLUDE ( CM_linux_packages.cmake )

+if (CYGWIN)
+ set(prefix ${CMAKE_INSTALL_PREFIX})
+ set(exec_prefix ${CMAKE_INSTALL_PREFIX})
+ set(libdir ${CMAKE_INSTALL_PREFIX}/lib)
+ set(includedir ${CMAKE_INSTALL_PREFIX}/include)
+ configure_file(${CMAKE_SOURCE_DIR}/libyuv.pc.in ${CMAKE_BINARY_DIR}/libyuv.pc @ONLY)
+ install(FILES ${CMAKE_BINARY_DIR}/libyuv.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
+endif()
+set(prefix ${CMAKE_INSTALL_PREFIX})
+set(exec_prefix ${CMAKE_INSTALL_PREFIX})
+set(libdir ${CMAKE_INSTALL_PREFIX}/lib)
+set(includedir ${CMAKE_INSTALL_PREFIX}/include)
+configure_file(${CMAKE_SOURCE_DIR}/libyuv.pc.in ${CMAKE_BINARY_DIR}/libyuv.pc @ONLY)
+install(FILES ${CMAKE_BINARY_DIR}/libyuv.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
--- origsrc/libyuv/libyuv.pc.in 1970-01-01 09:00:00.000000000 +0900
+++ src/libyuv/libyuv.pc.in 2022-04-25 16:24:09.161671400 +0900
+++ src/libyuv/libyuv.pc.in 2023-12-03 14:26:03.921114400 +0900
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
Expand Down

0 comments on commit e980e57

Please sign in to comment.