Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • videolan/vlc
  • chouquette/vlc
  • bakiewicz.marek122/vlc
  • devnexen/vlc
  • rohanrajpal/vlc
  • blurrrb/vlc
  • gsoc/gsoc2019/darkapex/vlc
  • b1ue/vlc
  • fkuehne/vlc
  • magsoft/vlc
  • chub/vlc
  • cramiro9/vlc
  • robUx4/vlc
  • rom1v/vlc
  • akshayaky/vlc
  • tmk907/vlc
  • akymaster/vlc
  • govind.sharma/vlc
  • psilokos/vlc
  • xjbeta/vlc
  • jahan/vlc
  • 1480c1/vlc
  • amanchande/vlc
  • aaqib/vlc
  • rist/vlc
  • apol/vlc
  • mindfreeze/vlc
  • alexandre-janniaux/vlc
  • sandsmark/vlc
  • jagannatharjun/vlc
  • gsoc/gsoc2020/matiaslgonzalez/vlc
  • gsoc/gsoc2020/jagannatharjun/vlc
  • mstorsjo/vlc
  • gsoc/gsoc2020/vedenta/vlc
  • gsoc/gsoc2020/arnav-ishaan/vlc
  • gsoc/gsoc2020/andreduong/vlc
  • fuzun/vlc
  • gsoc/gsoc2020/vatsin/vlc
  • gsoc/gsoc2020/sagid/vlc
  • yaron/vlc
  • Phoenix/vlc
  • Garf/vlc
  • ePiratWorkarounds/vlc
  • tguillem/vlc
  • jnqnfe/vlc
  • mdc/vlc
  • Vedaa/vlc
  • rasa/vlc
  • quink/vlc
  • yealo/vlc
  • aleksey_ak/vlc
  • ePirat/vlc
  • ilya.yanok/vlc
  • asenat/vlc
  • m/vlc
  • bunjee/vlc
  • BLumia/vlc
  • sagudev/vlc
  • hamedmonji30/vlc
  • nullgemm/vlc
  • DivyamAhuja/vlc
  • thesamesam/vlc
  • dag7/vlc
  • snehil101/vlc
  • haasn/vlc
  • jbk/vlc
  • ValZapod/vlc
  • mfkl/vlc
  • WangChuan/vlc
  • core1024/vlc
  • GhostVaibhav/vlc
  • dfuhrmann/vlc
  • davide.prade/vlc
  • tmatth/vlc
  • Courmisch/vlc
  • zouya/vlc
  • hpi/vlc
  • EwoutH/vlc
  • aleung27/vlc
  • hengwu0/vlc
  • saladin/vlc
  • ashuio/vlc
  • richselwood/vlc
  • verma16Ayush/vlc
  • chemicalflash/vlc
  • PoignardAzur/vlc
  • huangjieNT/vlc
  • Blake-Haydon/vlc
  • AnuthaDev/vlc
  • gsoc/gsoc2021/mpd/vlc
  • nicolas_lequec/vlc
  • sambassaly/vlc
  • thresh/vlc
  • bonniegong/vlc
  • myaashish/vlc
  • stavros.vagionitis/vlc
  • ileoo/vlc
  • louis-santucci/vlc
  • cchristiansen/vlc
  • sabyasachi07/vlc
  • AbduAmeen/vlc
  • ashishb0410/vlc
  • urbanhusky/vlc
  • davidepietrasanta/vlc
  • riksleutelstad/vlc
  • jeremyVignelles/vlc
  • komh/vlc
  • iamjithinjohn/vlc
  • JohannesKauffmann/vlc2
  • kunglao/vlc
  • natzberg/vlc
  • jill/vlc
  • cwendling/vlc
  • adufou/vlc
  • ErwanAirone/vlc
  • HasinduDilshan10/vlc
  • vagrantc/vlc
  • rafiv/macos-bigsur-icon
  • Aymeriic/vlc
  • saranshg20/vlc
  • metzlove24/vlc
  • linkfanel/vlc
  • Ds886/vlc
  • metehan-arslan/vlc
  • Skantes/vlc
  • kgsandundananjaya96/vlc
  • mitchcapper/vlc
  • advaitgupta/vlc
  • StefanBruens/vlc
  • ratajs/vlc
  • T.M.F.B.3761/vlc
  • m222059/vlc
  • casemerrick/vlc
  • joshuaword2alt/vlc
  • sjwaddy/vlc
  • dima/vlc
  • Ybalrid/vlc
  • umxprime/vlc
  • eschmidt/vlc
  • vannieuwenhuysenmichelle/vlc
  • badcf00d/vlc
  • wesinator/vlc
  • louis/vlc
  • xqq/vlc
  • EmperorYP7/vlc
  • NicoLiam/vlc
  • loveleen/vlc
  • rofferom/vlc
  • rbultje/vlc
  • TheUnamed/vlc
  • pratiksharma341/vlc
  • Saurab17/vlc
  • purist.coder/vlc
  • Shuicheng/vlc
  • mdrrubel292/vlc
  • silverbleu00/vlc
  • metif12/vlc
  • asher-m/vlc
  • jeffk/vlc
  • Brandonbr1/vlc
  • beautyyuyanli/vlc
  • rego21/vlc
  • muyangren907/vlc
  • collectionbylawrencejason/vlc
  • evelez/vlc
  • GSMgeeth/vlc
  • Oneric/vlc
  • TJ5/vlc
  • XuanTung95/vlc
  • darrenjenny21/vlc
  • Trenly/vlc
  • RockyTDR/vlc
  • mjakubowski/vlc
  • caprica/vlc
  • ForteFrankie/vlc
  • seannamiller19/vlc
  • junlon2006/vlc
  • kiwiren6666/vlc
  • iuseiphonexs/vlc
  • fenngtun/vlc
  • Rajdutt999/vlc
  • typx/vlc
  • leon.vitanos/vlc
  • robertogarci0938/vlc
  • gsoc/gsoc2022/luc65r/vlc-mpd
  • skeller/vlc
  • MCJack123/vlc
  • luc65r/vlc-mpd
  • popov895/vlc
  • claucambra/vlc
  • brad/vlc
  • matthewmurua88/vlc
  • Tomas8874/vlc
  • philenotfound/vlc
  • makita-do3/vlc
  • LZXCorp/vlc
  • mar0x/vlc
  • senojetkennedy0102/vlc
  • shaneb243/vlc
  • ahmadbader/vlc
  • rajduttcse26/vlc-audio-filters
  • Juniorzito8415/vlc
  • achernyakov/vlc
  • lucasjetgroup/vlc
  • pupdoggy666/vlc
  • gmde9363/vlc
  • alexnwayne/vlc
  • bahareebrahimi781/vlc
  • hamad633666/vlc
  • umghof3112/vlc
  • joe0199771874/vlc
  • Octocats66666666/vlc
  • jjm_223/vlc
  • btech10110.19/vlc
  • sunnykfc028/vlc-audio-filters
  • loic/vlc
  • nguyenminhducmx1/vlc
  • JanekKrueger/vlc
  • bstubbington2/vlc
  • rcombs/vlc
  • Ordissimo/vlc
  • king7532/vlc
  • noobsauce101/vlc
  • schong0525/vlc
  • myQwil/vlc
  • apisbg91/vlc
  • geeboy0101017/vlc
  • kim.faughey/vlc
  • nurupo/vlc
  • yyusea/vlc
  • 0711235879.khco/vlc
  • ialo/vlc
  • iloveyeye2/vlc
  • gdtdftdqtd/vlc
  • leandroconsiglio/vlc
  • AndyHTML2012/vlc
  • ncz/vlc
  • lucenticus/vlc
  • knr1931/vlc
  • kjoonlee/vlc
  • chandrakant100/vlc-qt
  • johge42/vlc
  • polter/vlc
  • hexchain/vlc
  • Tushwrld/vlc
  • mztea928/vlc
  • jbelloncastro/vlc
  • alvinhochun/vlc
  • ghostpiratecrow/vlc
  • ujjwaltwitx/vlc
  • alexsonarin06/vlc
  • adrianbon76/vlc
  • altsod/vlc
  • damien.lucas44/vlc
  • dmytrivtaisa/vlc
  • utk202/vlc
  • aaxhrj/vlc
  • thomas.hermes/vlc
  • structurenewworldorder/vlc
  • slomo/vlc
  • wantlamy/vlc
  • musc.o3cminc/vlc
  • thebarshablog/vlc
  • kerrick/vlc
  • kratos142518/vlc
  • leogps/vlc
  • vacantron/vlc
  • luna_koly/vlc
  • Ratio2/vlc
  • anuoshemohammad/vlc
  • apsun/vlc
  • aaa1115910/vlc
  • alimotmoyo/vlc
  • Ambossmann/vlc
  • Sam-LearnsToCode/vlc
  • Chilledheart/vlc
  • Labnann/vlc
  • ktcoooot1/vlc
  • mohit-marathe/vlc
  • johnddx/vlc
  • manstabuk/vlc
  • Omar-ahmed314/vlc
  • vineethkm/vlc
  • 9Enemi86/vlc
  • radoslav.m.panteleev/vlc
  • ashishami2002/vlc
  • Corbax/vlc
  • firnasahmed/vlc
  • pelayarmalam4/vlc
  • c0ff330k/vlc
  • shikhindahikar/vlc
  • l342723951/vlc
  • christianschwandner/vlc
  • douniwan5788/vlc
  • 7damian7/vlc
  • ferdnyc/vlc
  • f.ales1/vlc
  • pandagby/vlc
  • BaaBaa/vlc
  • jewe37/vlc
  • w00drow/vlc
  • russelltg/vlc
  • ironicallygod/vlc
  • soumyaDghosh/vlc
  • linzihao1999/vlc
  • deyayush6/vlc
  • mibi88/vlc
  • newabdallah10/vlc
  • jhorbincolombia/vlc
  • rimvihaqueshupto/vlc
  • andrewkhon98/vlc
  • fab78/vlc
  • lapaz17/vlc
  • amanna13/vlc
  • mdakram28/vlc
  • 07jw1980/vlc
  • sohamgupta/vlc
  • Eson-Jia1/vlc
  • Sumou/vlc
  • vikram-kangotra/vlc
  • chalice191/vlc
  • olivercalder/vlc
  • aaasg4001/vlc
  • zipdox/vlc
  • kwizart/vlc
  • Dragon-S/vlc
  • jdemeule/vlc
  • gabriel_lt/vlc
  • locutusofborg/vlc
  • sammirata/vlc-librist
  • another/vlc
  • Benjamin_Loison/vlc
  • ahmedmoselhi/vlc
  • petergaal/vlc
  • huynhsontung/vlc
  • dariusmihut/vlc
  • tvermaashutosh/vlc
  • buti/vlc
  • Niram7777/vlc
  • rohan-here/vlc
  • balaji-sivasakthi/vlc
  • rlindner81/vlc
  • Kakadus/vlc
  • djain/vlc
  • ABBurmeister/vlc
  • craighuggins/vlc
  • orbea/vlc
  • maxos/vlc
  • aakarshmj/vlc
  • kblaschke/vlc
  • ankitm/vlc
  • advait-0/vlc
  • mohak2003/vlc
  • yselkowitz/vlc
  • AZM999/vlc-azm
  • andrey.turkin/vlc
  • Disha-Baghel/vlc
  • nowrep/vlc
  • Apeng/vlc
  • Choucroute_melba/vlc
  • autra/vlc
  • eclipseo/vlc
  • fhuber/vlc
  • olafhering/vlc
  • sdasda7777/vlc
  • 1div0/vlc
  • skosnits/vlc-extended-playlist-support
  • dnicolson/vlc
  • Timshel/vlc
  • octopols/vlc
  • MangalK/vlc
  • nima64/vlc
  • misawai/vlc
  • Alexander-Wilms/vlc
  • Maxime2/vlc-fork-for-visualizer
  • ww/vlc
  • jeske/vlc
  • sgross-emlix/vlc
  • morenonatural/vlc
  • freakingLovesVLC/vlc
  • borisgolovnev/vlc
  • mpromonet/vlc
  • diogo.simao-marques/vlc
  • masstock/vlc
  • pratikpatel8982/vlc
  • hugok79/vlc
  • longervision/vlc
  • abhiudaysurya/vlc
  • rishabhgarg/vlc
  • tumic/vlc
  • cart/vlc
  • shubham442/vlc
  • Aditya692005/vlc
  • sammirata/vlc4
  • syrykh/vlc
  • Vvorcun/macos-new-icon
  • AyaanshC/vlc
  • nasso/vlc
  • Quark/vlc
  • sebastinas/vlc
  • rhstone/vlc
  • talregev/vlc
  • Managor/vlc
403 results
Show changes
Commits on Source (24)
Showing
with 74 additions and 188 deletions
......@@ -28,8 +28,6 @@ ifdef HAVE_WIN32
DEPS_aom += pthreads $(DEPS_pthreads)
endif
AOM_LDFLAGS := $(LDFLAGS)
AOM_CONF := \
-DCONFIG_RUNTIME_CPU_DETECT=1 \
-DCONFIG_MULTITHREAD=1 \
......@@ -80,7 +78,7 @@ endif
.aom: aom toolchain.cmake
rm -rf $(PREFIX)/include/aom
cd $< && rm -rf aom_build && mkdir -p aom_build
cd $</aom_build && LDFLAGS="$(AOM_LDFLAGS)" $(HOSTVARS) $(CMAKE) ../ $(AOM_CONF)
cd $</aom_build && $(HOSTVARS) $(CMAKE) ../ $(AOM_CONF)
+$(CMAKEBUILD) $</aom_build
$(call pkg_static,"aom_build/aom.pc")
+$(CMAKEBUILD) $</aom_build --target install
......
......@@ -22,6 +22,7 @@ chromaprint: chromaprint-$(CHROMAPRINT_VERSION).tar.gz .sum-chromaprint
DEPS_chromaprint = ffmpeg $(DEPS_ffmpeg)
.chromaprint: chromaprint toolchain.cmake
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS_PIC) $(CMAKE)
+$(CMAKEBUILD) $< --target install
touch $@
......@@ -18,6 +18,7 @@ ebml: libebml-$(EBML_VERSION).tar.xz .sum-ebml
$(MOVE)
.ebml: ebml toolchain.cmake
cd $< && $(HOSTVARS_PIC) $(CMAKE) -DENABLE_WIN32_IO=OFF
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS_PIC) $(CMAKE)
+$(CMAKEBUILD) $< --target install
touch $@
......@@ -42,6 +42,7 @@ FLUIDCONF := \
-Denable-readline=0
.fluid: fluidsynth toolchain.cmake
cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -DFLUIDSYNTH_NOT_A_DLL" $(CMAKE) $(FLUIDCONF)
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS) $(CMAKE) $(FLUIDCONF)
+$(CMAKEBUILD) $< --target install
touch $@
......@@ -26,7 +26,7 @@ fluidlite: fluidlite-$(FLUID_HASH).tar.xz .sum-fluidlite
$(MOVE)
.fluidlite: fluidlite toolchain.cmake
cd $< && rm -f CMakeCache.txt
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS) $(CMAKE)
+$(CMAKEBUILD) $< --target install
touch $@
......@@ -17,6 +17,7 @@ glew: glew-$(GLEW_VERSION).tgz .sum-glew
$(MOVE)
.glew: glew toolchain.cmake
cd $</build/cmake && $(HOSTVARS_PIC) $(CMAKE) -DGLEW_USE_STATIC_LIBS:BOOL=ON
rm -f $</build/cmake/CMakeCache.txt
cd $</build/cmake && $(HOSTVARS_PIC) $(CMAKE)
+$(CMAKEBUILD) $</build/cmake --target install
touch $@
......@@ -27,8 +27,10 @@ glslang: glslang-$(GLSLANG_VERSION).tar.gz .sum-glslang
$(APPLY) $(SRC)/glslang/glslang-win32.patch
$(MOVE)
GLSLANG_CONF := -DENABLE_GLSLANG_BINARIES=OFF
.glslang: glslang toolchain.cmake
cd $< && $(HOSTVARS_PIC) CXXFLAGS="-DYYDEBUG=0" $(CMAKE) \
-DENABLE_GLSLANG_BINARIES=OFF
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS_PIC) CXXFLAGS="-DYYDEBUG=0" $(CMAKE) $(GLSLANG_CONF)
+$(CMAKEBUILD) $< --target install
touch $@
......@@ -21,7 +21,10 @@ game-music-emu: game-music-emu-$(GME_VERSION).tar.xz .sum-gme
$(call pkg_static,"gme/libgme.pc.in")
$(MOVE)
GME_CONF := -DENABLE_UBSAN=OFF
.gme: game-music-emu toolchain.cmake
cd $< && $(HOSTVARS_PIC) $(CMAKE) . -DENABLE_UBSAN=OFF
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS_PIC) $(CMAKE) . $(GME_CONF)
+$(CMAKEBUILD) $< --target install
touch $@
......@@ -7,30 +7,26 @@ ifeq ($(call need_pkg,"libaribcaption"),)
PKGS_FOUND += libaribcaption
endif
LIBARIBCC_WITH_FREETYPE = 1
ifdef HAVE_ANDROID
LIBARIBCC_WITH_FONTCONFIG = 0
LIBARIBCC_WITH_CORETEXT = 0
LIBARIBCC_WITH_DIRECTWRITE = 0
else
ifdef HAVE_DARWIN_OS
LIBARIBCC_WITH_FONTCONFIG = 0
LIBARIBCC_WITH_CORETEXT = 1
LIBARIBCC_WITH_DIRECTWRITE = 0
else
ifdef HAVE_WIN32
LIBARIBCC_WITH_FONTCONFIG = 0
LIBARIBCC_WITH_CORETEXT = 0
LIBARIBCC_WITH_DIRECTWRITE = 1
else
LIBARIBCC_WITH_FONTCONFIG = 1
LIBARIBCC_WITH_CORETEXT = 0
LIBARIBCC_WITH_DIRECTWRITE = 0
endif
endif
endif
DEPS_libaribcaption = freetype2 $(DEPS_freetype2)
ifeq ($(LIBARIBCC_WITH_FONTCONFIG), 1)
DEPS_libaribcaption += fontconfig $(DEPS_fontconfig)
endif
$(TARBALLS)/libaribcaption-$(LIBARIBCC_VERSION).tar.xz:
$(call download_git,$(LIBARIBCC_GITURL),,$(LIBARIBCC_HASH))
......@@ -43,7 +39,6 @@ libaribcaption: libaribcaption-$(LIBARIBCC_VERSION).tar.xz .sum-libaribcaption
$(MOVE)
LIBARIBCC_CONF := \
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON \
-DARIBCC_NO_EXCEPTIONS:BOOL=ON \
-DARIBCC_NO_RTTI:BOOL=ON
......@@ -51,33 +46,17 @@ ifdef HAVE_ANDROID
LIBARIBCC_CONF += -DARIBCC_IS_ANDROID:BOOL=ON
endif
ifeq ($(LIBARIBCC_WITH_FREETYPE), 1)
DEPS_libaribcaption += freetype2 $(DEPS_freetype2)
LIBARIBCC_CONF += -DARIBCC_USE_FREETYPE:BOOL=ON
else
LIBARIBCC_CONF += -DARIBCC_USE_FREETYPE:BOOL=OFF
endif
ifeq ($(LIBARIBCC_WITH_FONTCONFIG), 1)
DEPS_libaribcaption += fontconfig $(DEPS_fontconfig)
LIBARIBCC_CONF += -DARIBCC_USE_FONTCONFIG:BOOL=ON
else
LIBARIBCC_CONF += -DARIBCC_USE_FONTCONFIG:BOOL=OFF
endif
ifeq ($(LIBARIBCC_WITH_CORETEXT), 1)
LIBARIBCC_CONF += -DARIBCC_USE_CORETEXT:BOOL=ON
else
LIBARIBCC_CONF += -DARIBCC_USE_CORETEXT:BOOL=OFF
endif
ifeq ($(LIBARIBCC_WITH_DIRECTWRITE), 1)
LIBARIBCC_CONF += -DARIBCC_USE_DIRECTWRITE:BOOL=ON
endif
.libaribcaption: libaribcaption toolchain.cmake
cd $< && rm -f CMakeCache.txt
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS_PIC) $(CMAKE) $(LIBARIBCC_CONF)
cd $< && $(CMAKEBUILD) . --target install
+$(CMAKEBUILD) $< --target install
touch $@
From 92f0606875e60885f7c9f7543b6c72731c87e525 Mon Sep 17 00:00:00 2001
From: Marvin Scholz <epirat07@gmail.com>
Date: Wed, 30 Sep 2020 12:31:17 +0200
Subject: [PATCH] CMake: Respect the BUILD_SHARED_LIBS option instead of
BUILD_STATIC_LIBS
Instead of the custom BUILD_STATIC_LIBS option, properly respect the
BUILD_SHARED_LIBS option as documented by CMake at
https://cmake.org/cmake/help/latest/variable/BUILD_SHARED_LIBS.html
---
CMakeLists.txt | 9 +++++---
ebur128/CMakeLists.txt | 52 +++++++++++++++++++++++-------------------
2 files changed, 35 insertions(+), 26 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f741317..3901457 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,9 @@
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
project(libebur128 C)
+option(BUILD_SHARED_LIBS
+ "Build shared libraries instead of static ones" ON)
+
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
@@ -23,10 +26,10 @@ endif()
message(STATUS "Status found / disabled --")
message(STATUS "queue.h: ${SUMMARY_HAS_QUEUE}" " ${USE_QUEUE}")
-if(BUILD_STATIC_LIBS)
- message(STATUS "build static library and shared library!")
+if(BUILD_SHARED_LIBS)
+ message(STATUS "Building shared library (set BUILD_SHARED_LIBS to NO to build static)")
else()
- message(STATUS "not building static library, set BUILD_STATIC_LIBS to ON to enable")
+ message(STATUS "Building static library")
endif()
if(NOT ${SUMMARY_HAS_QUEUE} AND NOT ${ENABLE_INTERNAL_QUEUE_H})
diff --git a/ebur128/CMakeLists.txt b/ebur128/CMakeLists.txt
index d77385e..0e7845c 100644
--- a/ebur128/CMakeLists.txt
+++ b/ebur128/CMakeLists.txt
@@ -25,30 +25,37 @@ endif()
set(EBUR128_VERSION_MAJOR 1)
set(EBUR128_VERSION 1.2.4)
-#### static
-if(BUILD_STATIC_LIBS)
- add_library(ebur128_static STATIC ebur128.c)
- if(NOT MSVC)
- set_property(TARGET ebur128_static PROPERTY OUTPUT_NAME ebur128)
- endif()
-endif()
+add_library(ebur128 ebur128.c)
-if(WITH_STATIC_PIC)
- set_property(TARGET ebur128_static PROPERTY POSITION_INDEPENDENT_CODE ON)
-endif()
+if(NOT BUILD_SHARED_LIBS)
+ # Static build specific things
+ if(WITH_STATIC_PIC)
+ set_property(TARGET ebur128 PROPERTY POSITION_INDEPENDENT_CODE ON)
-#### shared
-# set source file for library, which includes def file if using MSVC
-set(EBUR128_SHARED_SOURCE ebur128.c)
-if(MSVC)
- set(EBUR128_SHARED_SOURCE ${EBUR128_SHARED_SOURCE} ebur128.def)
-endif()
+ set_target_properties(ebur128 PROPERTIES
+ SOVERSION ${EBUR128_VERSION_MAJOR}
+ VERSION ${EBUR128_VERSION})
+ endif()
-add_library(ebur128 SHARED ${EBUR128_SHARED_SOURCE})
-set_target_properties(ebur128 PROPERTIES
+else()
+ # Share build specific things
+ set_target_properties(ebur128 PROPERTIES
SOVERSION ${EBUR128_VERSION_MAJOR}
VERSION ${EBUR128_VERSION})
+ if(WIN32)
+ set_target_properties(ebur128 PROPERTIES
+ OUTPUT_NAME ebur128
+ RUNTIME_OUTPUT_NAME ebur128-${EBUR128_VERSION_MAJOR}
+ ARCHIVE_OUTPUT_NAME ebur128)
+ endif(WIN32)
+
+ if(MSVC)
+ target_sources(ebur128 PRIVATE ebur128.def)
+ endif()
+endif()
+
+# Link with Math library if available
find_library(MATH_LIBRARY m)
if(MATH_LIBRARY)
target_link_libraries(ebur128 ${MATH_LIBRARY})
@@ -57,11 +64,10 @@ endif()
set(EBUR128_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
install(FILES ebur128.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-if(BUILD_STATIC_LIBS)
- install(TARGETS ebur128 ebur128_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-else()
- install(TARGETS ebur128 DESTINATION ${CMAKE_INSTALL_LIBDIR})
-endif()
+install(TARGETS ebur128
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
#### pkg-config
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libebur128.pc.cmake
--
2.24.3 (Apple Git-128)
d9aec133aca9240f7e859aae30cfcab07ba7aa20378187d53dfeec4cd3840d49bb117fa0698591bac04d95f9d8b5cd0b1fbe41c364694f2fa8267dd690b2dc02 libebur128-1.2.4.tar.gz
ab188c6d32cd14613119258313a8a3fb1167b55501c9f5b6d3ba738d674bc58f24ac3034c23d9730ed8dc3e95a23619bfb81719e4c79807a9a16c1a5b3423582 libebur128-1.2.6.tar.gz
# EBU R128 standard for loudness normalisation
LIBEBUR128_VERSION := 1.2.4
LIBEBUR128_VERSION := 1.2.6
LIBEBUR128_URL := https://github.com/jiixyj/libebur128/archive/v$(LIBEBUR128_VERSION).tar.gz
PKGS += libebur128
......@@ -16,10 +16,12 @@ $(TARBALLS)/libebur128-$(LIBEBUR128_VERSION).tar.gz:
libebur128: libebur128-$(LIBEBUR128_VERSION).tar.gz .sum-libebur128
$(UNPACK)
$(call pkg_static,"./ebur128/libebur128.pc.cmake")
$(APPLY) $(SRC)/libebur128/0001-CMake-Respect-the-BUILD_SHARED_LIBS-option-instead-o.patch
$(MOVE)
LIBEBUR128_CONF := -DENABLE_INTERNAL_QUEUE_H=TRUE
.libebur128: libebur128 toolchain.cmake
cd $< && $(HOSTVARS_PIC) $(CMAKE) -DENABLE_INTERNAL_QUEUE_H=TRUE
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS_PIC) $(CMAKE) $(LIBEBUR128_CONF)
+$(CMAKEBUILD) $< --target install
touch $@
......@@ -22,6 +22,7 @@ matroska: libmatroska-$(MATROSKA_VERSION).tar.xz .sum-matroska
$(MOVE)
.matroska: matroska toolchain.cmake
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS_PIC) $(CMAKE)
+$(CMAKEBUILD) $< --target install
touch $@
......@@ -41,8 +41,11 @@ ifdef HAVE_MACOSX
endif
$(MOVE)
MUSE_CONF := -DSHARED=OFF
.mpcdec: musepack toolchain.cmake
cd $< && $(HOSTVARS_PIC) $(CMAKE) -DSHARED=OFF .
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS_PIC) $(CMAKE) $(MUSE_CONF)
+$(CMAKEBUILD) $< --target install
mkdir -p -- "$(PREFIX)/lib"
# Use globbing to work around cmake's change of destination file
......
......@@ -23,9 +23,11 @@ mysofa: libmysofa-$(MYSOFA_VERSION).tar.gz .sum-mysofa
$(UNPACK)
$(MOVE)
MYSOFA_CONF := -DBUILD_TESTS=OFF
.mysofa: mysofa toolchain.cmake
cd $< && rm -f CMakeCache.txt
cd $< && $(HOSTVARS) $(CMAKE) -DBUILD_TESTS=OFF
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS) $(CMAKE) $(MYSOFA_CONF)
+$(CMAKEBUILD) $< --target install
touch $@
......@@ -26,10 +26,10 @@ endif
$(call pkg_static,"./src/lib/openjp2/libopenjp2.pc.cmake.in")
$(MOVE)
OPENJPEG_CONF := -DBUILD_PKGCONFIG_FILES=ON -DBUILD_CODEC:bool=OFF
.openjpeg: openjpeg toolchain.cmake
cd $< && $(HOSTVARS) $(CMAKE) \
-DBUILD_PKGCONFIG_FILES=ON \
-DBUILD_CODEC:bool=OFF \
.
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS) $(CMAKE) . $(OPENJPEG_CONF)
+$(CMAKEBUILD) $< --target install
touch $@
......@@ -15,6 +15,8 @@ ifeq ($(call need_pkg,"libprojectM"),)
PKGS_FOUND += projectM
endif
DEPS_projectM = glew $(DEPS_glew)
$(TARBALLS)/projectM-$(PROJECTM_VERSION)-Source.tar.gz:
$(call download_pkg,$(PROJECTM_URL),projectM)
......@@ -33,17 +35,14 @@ endif
$(APPLY) $(SRC)/projectM/missing-includes.patch
$(MOVE)
DEPS_projectM = glew $(DEPS_glew)
.projectM: projectM toolchain.cmake
cd $< && rm -f CMakeCache.txt
cd $< && $(HOSTVARS) $(CMAKE) \
-DINCLUDE-PROJECTM-LIBVISUAL:BOOL=OFF \
PROJECTM_CONF := \
-DDISABLE_NATIVE_PRESETS:BOOL=ON \
-DUSE_FTGL:BOOL=OFF \
-DINCLUDE-PROJECTM-PULSEAUDIO:BOOL=OFF \
-DINCLUDE-PROJECTM-QT:BOOL=OFF \
-DBUILD_PROJECTM_STATIC:BOOL=ON .
-DBUILD_PROJECTM_STATIC:BOOL=ON
.projectM: projectM toolchain.cmake
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS) $(CMAKE) . $(PROJECTM_CONF)
+$(CMAKEBUILD) $< --target install
-cd $<; cp Renderer/libRenderer.a MilkdropPresetFactory/libMilkdropPresetFactory.a $(PREFIX)/lib
touch $@
......@@ -21,6 +21,7 @@ soxr: soxr-$(SOXR_VERSION)-Source.tar.xz .sum-soxr
$(APPLY) $(SRC)/soxr/0003-add-aarch64-support.patch
$(APPLY) $(SRC)/soxr/0004-arm-fix-SIGILL-when-doing-divisions-on-some-old-arch.patch
$(APPLY) $(SRC)/soxr/find_ff_pkgconfig.patch
$(APPLY) $(SRC)/soxr/soxr-check-function.patch
$(call pkg_static,"src/soxr.pc.in")
$(MOVE)
......@@ -32,15 +33,15 @@ SOXR_EXTRA_CONF=-DCMAKE_SYSTEM_NAME=Generic
endif
endif
.soxr: soxr toolchain.cmake
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS_PIC) $(CMAKE) \
SOXR_CONF := \
$(SOXR_EXTRA_CONF) \
-DBUILD_EXAMPLES=OFF \
-DBUILD_TESTS=OFF \
-DWITH_LSR_BINDINGS=OFF \
-DWITH_OPENMP=OFF \
-DWITH_AVFFT=ON \
-Wno-dev
-DWITH_AVFFT=ON
.soxr: soxr toolchain.cmake
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS_PIC) $(CMAKE) $(SOXR_CONF)
+$(CMAKEBUILD) $< --target install
touch $@
--- soxr/CMakeLists.txt.31 2022-09-01 14:44:39.096702600 +0200
+++ soxr/CMakeLists.txt 2022-09-01 14:44:30.250234300 +0200
@@ -1,7 +1,7 @@
# SoX Resampler Library Copyright (c) 2007-18 robs@users.sourceforge.net
# Licence for this file: LGPL v2.1 See LICENCE for details.
-cmake_minimum_required (VERSION 3.1 FATAL_ERROR)
+cmake_minimum_required (VERSION 3.12 FATAL_ERROR)
project (soxr C)
set (DESCRIPTION_SUMMARY
......@@ -20,8 +20,10 @@ spatialaudio: spatialaudio-$(SPATIALAUDIO_VERSION).tar.bz2 .sum-spatialaudio
$(UNPACK)
$(MOVE)
SPATIALAUDIO_CONF := -DMYSOFA_ROOT_DIR=$(PREFIX) -DHAVE_MIT_HRTF=OFF
.spatialaudio: spatialaudio toolchain.cmake
cd $< && rm -f CMakeCache.txt
cd $< && $(HOSTVARS) $(CMAKE) -DMYSOFA_ROOT_DIR=$(PREFIX) -DHAVE_MIT_HRTF=OFF
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS) $(CMAKE) $(SPATIALAUDIO_CONF)
+$(CMAKEBUILD) $< --target install
touch $@