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 (11)
Showing
with 236 additions and 66 deletions
......@@ -77,9 +77,9 @@ endif
# libaom doesn't allow in-tree builds
.aom: aom toolchain.cmake
rm -rf $(PREFIX)/include/aom
cd $< && rm -rf aom_build && mkdir -p aom_build
cd $</aom_build && $(HOSTVARS) $(CMAKE) ../ $(AOM_CONF)
+$(CMAKEBUILD) $</aom_build
$(call pkg_static,"aom_build/aom.pc")
+$(CMAKEBUILD) $</aom_build --target install
$(CMAKECLEAN)
$(HOSTVARS) $(CMAKE) $(AOM_CONF)
+$(CMAKEBUILD)
$(call pkg_static,"build/aom.pc")
+$(CMAKEBUILD) --target install
touch $@
......@@ -22,7 +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
$(CMAKECLEAN)
$(HOSTVARS_PIC) $(CMAKE)
+$(CMAKEBUILD) --target install
touch $@
......@@ -18,7 +18,7 @@ ebml: libebml-$(EBML_VERSION).tar.xz .sum-ebml
$(MOVE)
.ebml: ebml toolchain.cmake
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS_PIC) $(CMAKE)
+$(CMAKEBUILD) $< --target install
$(CMAKECLEAN)
$(HOSTVARS_PIC) $(CMAKE)
+$(CMAKEBUILD) --target install
touch $@
......@@ -42,7 +42,7 @@ FLUIDCONF := \
-Denable-readline=0
.fluid: fluidsynth toolchain.cmake
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS) $(CMAKE) $(FLUIDCONF)
+$(CMAKEBUILD) $< --target install
$(CMAKECLEAN)
$(HOSTVARS) $(CMAKE) $(FLUIDCONF)
+$(CMAKEBUILD) --target install
touch $@
# fluidlite
FLUID_GITURL := https://github.com/divideconcept/FluidLite.git
FLUID_HASH := a95c0303a40deb335dd3e51a8a783bb99a403c31
FLUID_HASH := 238997654efb20e736512847f3f5f6d618de9423
ifdef HAVE_WIN32
PKGS += fluidlite
......@@ -26,7 +26,7 @@ fluidlite: fluidlite-$(FLUID_HASH).tar.xz .sum-fluidlite
$(MOVE)
.fluidlite: fluidlite toolchain.cmake
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS) $(CMAKE)
+$(CMAKEBUILD) $< --target install
$(CMAKECLEAN)
$(HOSTVARS) $(CMAKE)
+$(CMAKEBUILD) --target install
touch $@
......@@ -17,7 +17,7 @@ glew: glew-$(GLEW_VERSION).tgz .sum-glew
$(MOVE)
.glew: glew toolchain.cmake
rm -f $</build/cmake/CMakeCache.txt
cd $</build/cmake && $(HOSTVARS_PIC) $(CMAKE)
+$(CMAKEBUILD) $</build/cmake --target install
$(CMAKECLEAN)
$(HOSTVARS_PIC) $(CMAKE) -S $</build/cmake
+$(CMAKEBUILD) --target install
touch $@
......@@ -30,7 +30,7 @@ glslang: glslang-$(GLSLANG_VERSION).tar.gz .sum-glslang
GLSLANG_CONF := -DENABLE_GLSLANG_BINARIES=OFF
.glslang: glslang toolchain.cmake
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS_PIC) CXXFLAGS="-DYYDEBUG=0" $(CMAKE) $(GLSLANG_CONF)
+$(CMAKEBUILD) $< --target install
$(CMAKECLEAN)
$(HOSTVARS_PIC) CXXFLAGS="-DYYDEBUG=0" $(CMAKE) $(GLSLANG_CONF)
+$(CMAKEBUILD) --target install
touch $@
......@@ -24,7 +24,7 @@ game-music-emu: game-music-emu-$(GME_VERSION).tar.xz .sum-gme
GME_CONF := -DENABLE_UBSAN=OFF
.gme: game-music-emu toolchain.cmake
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS_PIC) $(CMAKE) . $(GME_CONF)
+$(CMAKEBUILD) $< --target install
$(CMAKECLEAN)
$(HOSTVARS_PIC) $(CMAKE) $(GME_CONF)
+$(CMAKEBUILD) --target install
touch $@
......@@ -56,7 +56,7 @@ endif
.libaribcaption: libaribcaption toolchain.cmake
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS_PIC) $(CMAKE) $(LIBARIBCC_CONF)
+$(CMAKEBUILD) $< --target install
$(CMAKECLEAN)
$(HOSTVARS_PIC) $(CMAKE) $(LIBARIBCC_CONF)
+$(CMAKEBUILD) --target install
touch $@
......@@ -21,7 +21,7 @@ libebur128: libebur128-$(LIBEBUR128_VERSION).tar.gz .sum-libebur128
LIBEBUR128_CONF := -DENABLE_INTERNAL_QUEUE_H=TRUE
.libebur128: libebur128 toolchain.cmake
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS_PIC) $(CMAKE) $(LIBEBUR128_CONF)
+$(CMAKEBUILD) $< --target install
$(CMAKECLEAN)
$(HOSTVARS_PIC) $(CMAKE) $(LIBEBUR128_CONF)
+$(CMAKEBUILD) --target install
touch $@
......@@ -445,8 +445,10 @@ RECONF = mkdir -p -- $(PREFIX)/share/aclocal && \
# When using a single command, make might take a shortcut and fork/exec
# itself instead of relying on a shell, but a bug in gnulib ends up
# trying to execute a cmake folder when one is found in the PATH
CMAKEBUILD := env cmake --build
CMAKE = cmake . -DCMAKE_TOOLCHAIN_FILE=$(abspath toolchain.cmake) \
CMAKEBUILD = env cmake --build $</build
CMAKECLEAN = rm -f $</build/CMakeCache.txt
CMAKE = cmake -S $< -DCMAKE_TOOLCHAIN_FILE=$(abspath toolchain.cmake) \
-B $</build \
-DCMAKE_INSTALL_PREFIX:STRING=$(PREFIX) \
-DBUILD_SHARED_LIBS:BOOL=OFF \
-DCMAKE_INSTALL_LIBDIR:STRING=lib
......
......@@ -22,7 +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
$(CMAKECLEAN)
$(HOSTVARS_PIC) $(CMAKE)
+$(CMAKEBUILD) --target install
touch $@
From 1db3ae6dd941c1f68e0d447bb70a18679fccea2f Mon Sep 17 00:00:00 2001
From: r2d <r2d@c51c8d5e-032a-db11-a0f2-0002b3467eef>
Date: Mon, 21 Oct 2013 20:34:18 +0000
Subject: [PATCH 4/6] libmpcdec : added install and soversion
git-svn-id: http://svn.musepack.net/libmpc/trunk@482 c51c8d5e-032a-db11-a0f2-0002b3467eef
---
CMakeLists.txt | 1 -
include/CMakeLists.txt | 1 -
libmpcdec/CMakeLists.txt | 16 ++++++++++++++++
libmpcdec/Makefile.am | 1 +
4 files changed, 17 insertions(+), 2 deletions(-)
delete mode 100644 include/CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06d4363..e958296 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,4 +23,3 @@ add_subdirectory(libmpcdec)
add_subdirectory(libmpcpsy)
add_subdirectory(libmpcenc)
add_subdirectory(libwavformat)
-add_subdirectory(include)
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
deleted file mode 100644
index 074461d..0000000
--- a/include/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-INSTALL(DIRECTORY mpc DESTINATION include)
diff --git a/libmpcdec/CMakeLists.txt b/libmpcdec/CMakeLists.txt
index 0bc5b62..fb18968 100644
--- a/libmpcdec/CMakeLists.txt
+++ b/libmpcdec/CMakeLists.txt
@@ -1,7 +1,23 @@
+SET(mpcdec_VERSION_MAJOR 7)
+SET(mpcdec_VERSION_MINOR 0)
+SET(mpcdec_VERSION_PATCH 1)
+
+set(mpcdec_VERSION ${mpcdec_VERSION_MAJOR}.${mpcdec_VERSION_MINOR}.${mpcdec_VERSION_PATCH})
+
include_directories(${libmpc_SOURCE_DIR}/include)
+install(FILES
+ ${libmpc_SOURCE_DIR}/include/mpc/mpcdec.h
+ ${libmpc_SOURCE_DIR}/include/mpc/reader.h
+ ${libmpc_SOURCE_DIR}/include/mpc/streaminfo.h
+ ${libmpc_SOURCE_DIR}/include/mpc/mpc_types.h
+ DESTINATION include/mpc COMPONENT headers)
+
if(SHARED)
add_library(mpcdec SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
+ set_target_properties(mpcdec PROPERTIES VERSION ${mpcdec_VERSION} SOVERSION ${mpcdec_VERSION_MAJOR})
+ install(TARGETS mpcdec LIBRARY DESTINATION "lib" COMPONENT libraries)
else(SHARED)
add_library(mpcdec_static STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
+ install(TARGETS mpcdec_static ARCHIVE DESTINATION "lib/static" COMPONENT libraries)
endif(SHARED)
diff --git a/libmpcdec/Makefile.am b/libmpcdec/Makefile.am
index 48f3835..048217a 100644
--- a/libmpcdec/Makefile.am
+++ b/libmpcdec/Makefile.am
@@ -16,4 +16,5 @@ libmpcdec_la_SOURCES = huffman.c mpc_decoder.c mpc_reader.c \
mpc_bits_reader.h huffman.h decoder.h internal.h requant.h mpcdec_math.h \
$(common_sources)
+# version info shoud match the one in CMakeLists.txt
libmpcdec_la_LDFLAGS = -no-undefined -version-info 7:0:1
--
2.37.3.windows.1
From bab8308ca1ae6b96f4e1c2929608e02971d24009 Mon Sep 17 00:00:00 2001
From: r2d <r2d@c51c8d5e-032a-db11-a0f2-0002b3467eef>
Date: Sun, 5 Oct 2014 18:31:05 +0000
Subject: [PATCH 5/6] If BUILD_SHARED_LIBS is set and SHARED undefined, then
drive SHARED with the BUILD_SHARED_LIBS value. patch by Samuel Martin
<s.martin49@gmail.com>
git-svn-id: http://svn.musepack.net/libmpc/trunk@485 c51c8d5e-032a-db11-a0f2-0002b3467eef
---
CMakeLists.txt | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e958296..50666fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,11 +7,16 @@ project(libmpc C)
set(CMAKE_VERBOSE_MAKEFILE false)
TEST_BIG_ENDIAN(MPC_ENDIANNESS)
-if(WIN32)
- option(SHARED "Use shared libmpcdec" OFF)
-else(WIN32)
- option(SHARED "Use shared libmpcdec" ON)
-endif(WIN32)
+# Use the standard CMake flag to drive the shared object build.
+if(DEFINED BUILD_SHARED_LIBS AND NOT DEFINED SHARED)
+ set(SHARED ${BUILD_SHARED_LIBS})
+else()
+ if(WIN32)
+ option(SHARED "Use shared libmpcdec" OFF)
+ else(WIN32)
+ option(SHARED "Use shared libmpcdec" ON)
+ endif(WIN32)
+endif()
add_definitions(-DFAST_MATH -DCVD_FASTLOG)
--
2.37.3.windows.1
From 617c72c7df93da5bcca2febbad066e31a411d976 Mon Sep 17 00:00:00 2001
From: r2d <r2d@c51c8d5e-032a-db11-a0f2-0002b3467eef>
Date: Sun, 14 Feb 2016 22:07:10 +0000
Subject: [PATCH 6/6] adapted patch 0001-shared.patch from buildroot:
https://git.busybox.net/buildroot/tree/package/musepack/0001-shared.patch
original changelog :
Fixup installation of shared mpcdec library.
Based on gentoo patch.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
git-svn-id: http://svn.musepack.net/libmpc/trunk@491 c51c8d5e-032a-db11-a0f2-0002b3467eef
---
libmpcdec/CMakeLists.txt | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/libmpcdec/CMakeLists.txt b/libmpcdec/CMakeLists.txt
index fb18968..fa9c800 100644
--- a/libmpcdec/CMakeLists.txt
+++ b/libmpcdec/CMakeLists.txt
@@ -4,7 +4,6 @@ SET(mpcdec_VERSION_PATCH 1)
set(mpcdec_VERSION ${mpcdec_VERSION_MAJOR}.${mpcdec_VERSION_MINOR}.${mpcdec_VERSION_PATCH})
-include_directories(${libmpc_SOURCE_DIR}/include)
install(FILES
${libmpc_SOURCE_DIR}/include/mpc/mpcdec.h
${libmpc_SOURCE_DIR}/include/mpc/reader.h
@@ -12,12 +11,16 @@ install(FILES
${libmpc_SOURCE_DIR}/include/mpc/mpc_types.h
DESTINATION include/mpcdec COMPONENT headers)
+include_directories(${libmpc_SOURCE_DIR}/include)
if(SHARED)
- add_library(mpcdec SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
- set_target_properties(mpcdec PROPERTIES VERSION ${mpcdec_VERSION} SOVERSION ${mpcdec_VERSION_MAJOR})
- install(TARGETS mpcdec LIBRARY DESTINATION "lib" COMPONENT libraries)
+ add_library(mpcdec_shared SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
+ set_target_properties(mpcdec_shared PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1 VERSION ${mpcdec_VERSION} SOVERSION ${mpcdec_VERSION_MAJOR})
+ install(TARGETS mpcdec_shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT libraries)
+ target_link_libraries(mpcdec_shared m)
else(SHARED)
add_library(mpcdec_static STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
- install(TARGETS mpcdec_static ARCHIVE DESTINATION "lib/static" COMPONENT libraries)
+ set_target_properties(mpcdec_static PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1)
+ install(TARGETS mpcdec_static LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT libraries)
+ target_link_libraries(mpcdec_static m)
endif(SHARED)
--
2.37.3.windows.1
......@@ -28,26 +28,14 @@ musepack: musepack_src_r$(MUSE_REV).tar.gz .sum-mpcdec
$(UNPACK)
$(APPLY) $(SRC)/mpcdec/musepack-no-cflags-clobber.patch
$(APPLY) $(SRC)/mpcdec/musepack-no-binaries.patch
ifdef HAVE_VISUALSTUDIO
$(APPLY) $(SRC)/mpcdec/musepack-asinh-msvc.patch
endif
sed -i.orig \
-e 's,^add_subdirectory(mpcgain),,g' \
-e 's,^add_subdirectory(mpcchap),,g' \
$(UNPACK_DIR)/CMakeLists.txt
ifdef HAVE_MACOSX
cd $(UNPACK_DIR) && \
sed -e 's%-O3 -Wall%-O3 -Wall $(CFLAGS)%' CMakeLists.txt
endif
$(APPLY) $(SRC)/mpcdec/0004-libmpcdec-added-install-and-soversion.patch
$(APPLY) $(SRC)/mpcdec/0005-If-BUILD_SHARED_LIBS-is-set-and-SHARED-undefined-the.patch
$(APPLY) $(SRC)/mpcdec/0006-adapted-patch-0001-shared.patch-from-buildroot.patch
$(MOVE)
MUSE_CONF := -DSHARED=OFF
.mpcdec: musepack toolchain.cmake
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
cd $< && cp libmpcdec/*mpcdec_static.* "$(PREFIX)/lib/libmpcdec.a"
$(CMAKECLEAN)
$(HOSTVARS_PIC) $(CMAKE) $(MUSE_CONF)
+$(CMAKEBUILD) --target install
touch $@
......@@ -26,8 +26,8 @@ mysofa: libmysofa-$(MYSOFA_VERSION).tar.gz .sum-mysofa
MYSOFA_CONF := -DBUILD_TESTS=OFF
.mysofa: mysofa toolchain.cmake
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS) $(CMAKE) $(MYSOFA_CONF)
+$(CMAKEBUILD) $< --target install
$(CMAKECLEAN)
$(HOSTVARS) $(CMAKE) $(MYSOFA_CONF)
+$(CMAKEBUILD) --target install
touch $@
......@@ -29,7 +29,7 @@ endif
OPENJPEG_CONF := -DBUILD_PKGCONFIG_FILES=ON -DBUILD_CODEC:bool=OFF
.openjpeg: openjpeg toolchain.cmake
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS) $(CMAKE) . $(OPENJPEG_CONF)
+$(CMAKEBUILD) $< --target install
$(CMAKECLEAN)
$(HOSTVARS) $(CMAKE) $(OPENJPEG_CONF)
+$(CMAKEBUILD) --target install
touch $@
--- projectM/MilkdropPresetFactory/CMakeLists.txt.orig 2022-09-13 09:39:32.537914700 +0200
+++ projectM/MilkdropPresetFactory/CMakeLists.txt 2022-09-13 09:39:11.108002400 +0200
@@ -17,3 +17,4 @@ LINK_DIRECTORIES(${projectM_BINARY_DIR}
ADD_LIBRARY(MilkdropPresetFactory STATIC ${MilkdropPresetFactory_SOURCES})
SET_TARGET_PROPERTIES(MilkdropPresetFactory PROPERTIES VERSION 2.00 SOVERSION 2)
TARGET_LINK_LIBRARIES(MilkdropPresetFactory Renderer)
+INSTALL(TARGETS MilkdropPresetFactory LIBRARY)
--- projectM/Renderer/CMakeLists.txt.orig 2022-09-13 09:39:40.281885500 +0200
+++ projectM/Renderer/CMakeLists.txt 2022-09-13 09:39:07.123633100 +0200
@@ -11,3 +11,4 @@ INCLUDE_DIRECTORIES(${projectM_SOURCE_DI
ADD_LIBRARY(Renderer STATIC ${Renderer_SOURCES})
SET_TARGET_PROPERTIES(Renderer PROPERTIES VERSION 2.00 SOVERSION 2)
TARGET_LINK_LIBRARIES(Renderer m)
+INSTALL(TARGETS Renderer LIBRARY)
......@@ -33,6 +33,7 @@ endif
$(APPLY) $(SRC)/projectM/gcc6.patch
$(APPLY) $(SRC)/projectM/clang6.patch
$(APPLY) $(SRC)/projectM/missing-includes.patch
$(APPLY) $(SRC)/projectM/projectm-cmake-install.patch
$(MOVE)
PROJECTM_CONF := \
......@@ -42,8 +43,7 @@ PROJECTM_CONF := \
-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
$(CMAKECLEAN)
$(HOSTVARS) $(CMAKE) $(PROJECTM_CONF)
+$(CMAKEBUILD) --target install
touch $@