diff --git a/srcpkgs/dumb/patches/example-use-1.0-api.patch b/srcpkgs/dumb/patches/example-use-1.0-api.patch deleted file mode 100644 index ef94b4aa6d1..00000000000 --- a/srcpkgs/dumb/patches/example-use-1.0-api.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- %_example_wrksrc%/dumb2wav.c.orig -+++ %_example_wrksrc%/dumb2wav.c -@@ -221,7 +221,7 @@ - if (!duh) { - duh = dumb_load_s3m(fn); - if (!duh) { -- duh = dumb_load_mod(fn); -+ duh = dumb_load_mod(fn, 0); - if (!duh) { - fprintf(stderr, "Unable to open %s!\n", fn); - return EXIT_FAILURE; diff --git a/srcpkgs/dumb/patches/fix-build.patch b/srcpkgs/dumb/patches/fix-build.patch deleted file mode 100644 index bcb4d3eb741..00000000000 --- a/srcpkgs/dumb/patches/fix-build.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- %_library_wrksrc%/cmake/CMakeLists.txt.orig -+++ %_library_wrksrc%/cmake/CMakeLists.txt -@@ -1,7 +1,7 @@ - cmake_minimum_required(VERSION 2.6) - project(libdumb C) - --set(CMAKE_C_FLAGS "-Wall -DDUMB_DECLARE_DEPRECATED -D_USE_SSE -msse -Wno-unused-variable -Wno-unused-but-set-variable") -+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -DDUMB_DECLARE_DEPRECATED -Wno-unused-variable -Wno-unused-but-set-variable") - set(CMAKE_C_FLAGS_DEBUG "-ggdb -DDEBUGMODE=1 -D_DEBUG") - set(CMAKE_C_FLAGS_RELEASE "-ffast-math -O2 -DNDEBUG") - set(CMAKE_C_FLAGS_RELWITHDEBINFO "-ffast-math -g -O2 -DNDEBUG") -@@ -103,6 +103,7 @@ - ) - - add_library(dumb ${SOURCES}) -+set_target_properties(dumb PROPERTIES VERSION 1.0) - set_target_properties(dumb PROPERTIES DEBUG_POSTFIX d) - - # Make sure the dylib install name path is set on OSX so you can include dumb in app bundles diff --git a/srcpkgs/dumb/template b/srcpkgs/dumb/template index da6c5cbfff1..b792fcfa195 100644 --- a/srcpkgs/dumb/template +++ b/srcpkgs/dumb/template @@ -1,7 +1,7 @@ # Template file for 'dumb' pkgname=dumb version=1.0 -revision=1 +revision=2 create_wrksrc=yes wrksrc=sources @@ -31,11 +31,12 @@ case "$XBPS_TARGET_MACHINE" in ;; esac -pre_fetch() { - sed -i \ - -e "s,%_library_wrksrc%,$_library_wrksrc," \ - -e "s,%_example_wrksrc%,$_example_wrksrc," \ - $PATCHESDIR/* +pre_configure() { + sed -i ${wrksrc}/${_library_wrksrc}/cmake/CMakeLists.txt \ + -e '/^set(CMAKE_C_FLAGS /s|-Wall|${CMAKE_C_FLAGS} -Wall|' \ + -e '/^add_library(dumb ${SOURCES})/a set_target_properties(dumb PROPERTIES VERSION 1.0)' + sed -i ${wrksrc}/${_example_wrksrc}/dumb2wav.c \ + -e '/.*dumb_load_mod(fn/s|)|,0)|' } post_build() {