diff --git a/.gitignore b/.gitignore index 54ad0d1..1818f46 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,3 @@ /whisper.cpp-1.7.1.tar.gz /whisper.cpp-1.7.6.tar.gz /whisper.cpp-1.8.1.tar.gz -/whisper.cpp-1.8.3.tar.gz -/whisper.cpp-1.9.2.tar.gz -/whisper.cpp-1.9.3.tar.gz diff --git a/sources b/sources index 22e1739..556d8d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (whisper.cpp-1.9.3.tar.gz) = 5e01ca94a49438b71e38c3cab710cf75a7aa76a1ae03fe8f81b1a5beb794becb1ae1c6e078e3eea5526e4ad89ae4cc0306d17974541050afb3a7ac1d09f94768 +SHA512 (whisper.cpp-1.8.1.tar.gz) = 5dc2f7d8833a592a0ba3d8684425e030876e321f5005bec354564600923195eff906937a43e7604326fa2caf4548331a3fdff4b0797d66baa2dfa8e066e321f3 diff --git a/whisper-cpp.spec b/whisper-cpp.spec index 2530b24..ecbb44f 100644 --- a/whisper-cpp.spec +++ b/whisper-cpp.spec @@ -8,7 +8,7 @@ License: MIT # examples/whisper.android/gradlew* # These are not distributed -Version: 1.9.3 +Version: 1.8.1 Release: %autorelease URL: https://github.com/ggerganov/whisper.cpp @@ -20,8 +20,7 @@ ExclusiveArch: x86_64 aarch64 ppc64le # OpenVINO only supports x86_64 and aarch64 # Presently, Fedora only packages it on x86_64 %ifarch x86_64 -# FTBFS 7/27/26 openvino needs rebuilding at least -%bcond_with openvino +%bcond_without openvino %bcond_without rocm %else %bcond_with openvino @@ -36,11 +35,9 @@ ExclusiveArch: x86_64 aarch64 ppc64le %if %{with rocm} %global build_rocm ON -# need our own gpu list, without gfx1250 -%global rocm_gpu_list "gfx9-generic;gfx942;gfx950;gfx10-1-generic;gfx10-3-generic;gfx1100;gfx1101;gfx1102;gfx1103;gfx1150;gfx1151;gfx1152;gfx1153;gfx1200;gfx1201" %else %global build_rocm OFF -%global rocm_gpu_list %{nil} +%global rocm_gpu_list_default %{nil} %endif %bcond_with test @@ -109,9 +106,17 @@ recognition (ASR) model: %prep %autosetup -p1 -n whisper.cpp-%{version} +# Add SOVERSION to the shared libraries +sed -i -e 's@POSITION_INDEPENDENT_CODE ON@POSITION_INDEPENDENT_CODE ON SOVERSION %{sover}@' src/CMakeLists.txt +sed -i -e 's@POSITION_INDEPENDENT_CODE ON@POSITION_INDEPENDENT_CODE ON SOVERSION %{sover}@' ggml/src/CMakeLists.txt +sed -i -e 's@POSITION_INDEPENDENT_CODE ON@POSITION_INDEPENDENT_CODE ON SOVERSION %{sover}@' ggml/src/ggml-cpu/CMakeLists.txt +sed -i '/target_compile_definitions(${backend} PUBLIC GGML_BACKEND_SHARED)/a\ +set_target_properties(${backend} PROPERTIES POSITION_INDEPENDENT_CODE ON SOVERSION %{sover})' ggml/src/CMakeLists.txt + %build + %cmake \ - -DCMAKE_HIP_ARCHITECTURES=%{rocm_gpu_list} \ + -DCMAKE_HIP_ARCHITECTURES=%{rocm_gpu_list_default} \ -DWHISPER_BUILD_EXAMPLES=%{build_test} \ -DWHISPER_BUILD_SERVER=%{build_test} \ -DWHISPER_BUILD_TESTS=%{build_test} \ @@ -158,7 +163,6 @@ find %{buildroot} -name 'whisper.pc' -delete %{_libdir}/libggml-base.so.* %{_libdir}/libggml-cpu.so.* %{_libdir}/libwhisper.so.* -%{_libdir}/libparakeet.so.* %if %{with rocm} %{_libdir}/libggml-hip.so.* @@ -166,16 +170,17 @@ find %{buildroot} -name 'whisper.pc' -delete %files devel %doc README.md -%{_includedir}/*.h +%{_includedir}/ggml*.h +%{_includedir}/gguf.h +%{_includedir}/whisper.h %{_libdir}/libggml.so %{_libdir}/libggml-base.so %{_libdir}/libggml-cpu.so -%{_libdir}/libparakeet.so %{_libdir}/libwhisper.so -%{_libdir}/cmake/ggml/ -%{_libdir}/cmake/parakeet/ -%{_libdir}/cmake/whisper/ -%{_libdir}/pkgconfig/parakeet.pc +%dir %{_libdir}/cmake/whisper +%dir %{_libdir}/cmake/ggml +%{_libdir}/cmake/whisper/*.cmake +%{_libdir}/cmake/ggml/*.cmake %if %{with rocm} %{_libdir}/libggml-hip.so