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 (2)
  • Alexandre Janniaux's avatar
    caca: fix to newer version · 2c7b5e00
    Alexandre Janniaux authored and Rémi Denis-Courmont's avatar Rémi Denis-Courmont committed
    Migrate to the new API instead of libcucul API, which has been merged
    into libcaca since 0.99.beta15:
    
        commit f61816ceb7445f8bf818936151554ac060764b39
        Author: Sam Hocevar <sam@hocevar.net>
        Date:   Sat Sep 27 13:12:46 2008 +0000
    
        Starting refactoring to get rid of libcucul. The initial reason for the
        split is rendered moot by the plugin system: when enabled, binaries do
        not link directly with libX11 or libGL. I hope this is a step towards
        more consisteny and clarity.
    
    It was then completely wiped out by the following commit, which is part
    of v0.99.beta20:
    
        commit 5f0ec215f8c9915ed028324a8ecac8212f68e18d
        Author: Sam Hocevar <sam@hocevar.net>
        Date:   Thu May 3 10:33:30 2018 +0200
    
        Remove legacy code from 10 years ago.
    2c7b5e00
  • Alexandre Janniaux's avatar
    caca: update contrib to 0.99.beta20 · 2d597455
    Alexandre Janniaux authored and Rémi Denis-Courmont's avatar Rémi Denis-Courmont committed
    The new contrib fixes a bunch of reported CVE:
    
        CVE-2021-30498  (tga export, not concerned)
        CVE-2021-30499  (troff export, not concerned)
        CVE-2021-3410   (canvas.c, v0.99.beta19)
        CVE-2018-20546  (dither.c, v0.99.beta19)
        CVE-2018-20547  (dither.c, v0.99.beta19)
        CVE-2018-20545  (load_image, v0.99.beta19)
        CVE-2018-20548  (load_image, v0.99.beta19)
        CVE-2018-20549  (caca_file_read, 0.99.beta19, not concerned)
    
    See release note[^1] on the github project.
    
    It also allow to migrate the use of the new API instead of libcucul,
    which has been merged into libcaca since 0.99.beta15:
    
        commit f61816ceb7445f8bf818936151554ac060764b39
        Author: Sam Hocevar <sam@hocevar.net>
        Date:   Sat Sep 27 13:12:46 2008 +0000
    
        Starting refactoring to get rid of libcucul. The initial reason for the
        split is rendered moot by the plugin system: when enabled, binaries do
        not link directly with libX11 or libGL. I hope this is a step towards
        more consisteny and clarity.
    
    It was then completely wiped out by the following commit, which is part
    of v0.99.beta20:
    
        commit 5f0ec215f8c9915ed028324a8ecac8212f68e18d
        Author: Sam Hocevar <sam@hocevar.net>
        Date:   Thu May 3 10:33:30 2018 +0200
    
        Remove legacy code from 10 years ago.
    
    Check NEWS for details:
    
        \section news0_99_beta15 Changes between 0.99.beta15 and 0.99.beta14
    
         - libcucul was merged back into libcaca for more clarity
    
    [^1]: https://github.com/cacalabs/libcaca/releases/tag/v0.99.beta20
    2d597455
1d08a45a742cbda2c80810e753b49588cb9073ef545a1d47537745c4e62dc79748a25907903ffee58676d9aa5b75c5e0658666429cf028e10c09157d418c8d19 libcaca-0.99.beta17.tar.gz
ab03e6c7d17fd152b2d5e9161799531f5e87322e174cb9d25874700f5bc1acfaf8bc2736e733998dad906f793c5a0304740dd39eec04a5e4c3d181bb109b4f23 libcaca-0.99.beta20.tar.gz
--- caca/caca/Makefile.am 2018-05-16 16:48:26.720331200 +0200
+++ caca/caca/Makefile.am.ln 2018-05-16 16:47:40.299559100 +0200
@@ -77,15 +77,15 @@ install-exec-local:
$(mkinstalldirs) $(DESTDIR)$(libdir)
. ./libcaca.la || exit 1; \
for x in $$library_names; do \
- ln -sf $$x $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
+ $(LN_S)f $$x $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
done
- ln -sf libcaca.la $(DESTDIR)$(libdir)/libcucul.la
+ $(LN_S)f libcaca.la $(DESTDIR)$(libdir)/libcucul.la
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
- ln -sf caca.pc $(DESTDIR)$(pkgconfigdir)/cucul.pc
+ $(LN_S)f caca.pc $(DESTDIR)$(pkgconfigdir)/cucul.pc
$(mkinstalldirs) $(DESTDIR)$(includedir)
- ln -sf caca.h $(DESTDIR)$(includedir)/cucul.h
+ $(LN_S)f caca.h $(DESTDIR)$(includedir)/cucul.h
uninstall-local:
. ./libcaca.la || exit 1; \
--- caca/cxx/Makefile.am 2018-05-16 16:52:26.779732200 +0200
+++ caca/cxx/Makefile.am.ln 2018-05-16 16:51:42.191400000 +0200
@@ -26,13 +26,13 @@ install-exec-local:
$(mkinstalldirs) $(DESTDIR)$(libdir)
. ./libcaca++.la || exit 1; \
for x in $$library_names; do \
- ln -sf $$x $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
+ $(LN_S)f $$x $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
done
- ln -sf libcaca++.la $(DESTDIR)$(libdir)/libcucul++.la
+ $(LN_S)f libcaca++.la $(DESTDIR)$(libdir)/libcucul++.la
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
- ln -sf caca++.pc $(DESTDIR)$(pkgconfigdir)/cucul++.pc
+ $(LN_S)f caca++.pc $(DESTDIR)$(pkgconfigdir)/cucul++.pc
endif
uninstall-local:
--- caca/doc/Makefile.am 2018-05-16 16:52:49.359771300 +0200
+++ caca/doc/Makefile.am.ln 2018-05-16 16:51:49.010973600 +0200
@@ -42,7 +42,7 @@ clean-local:
install-data-local:
if BUILD_DOCUMENTATION
mkdir -p $(DESTDIR)$(datadir)/doc
- ln -sf libcaca-dev $(DESTDIR)$(datadir)/doc/libcucul-dev
+ $(LN_S)f libcaca-dev $(DESTDIR)$(datadir)/doc/libcucul-dev
$(mkinstalldirs) $(DESTDIR)$(datadir)/doc/libcaca-dev/html
cp `find html -name '*.html' -o -name '*.gif' -o -name '*.png'` \
$(DESTDIR)$(datadir)/doc/libcaca-dev/html
@@ -54,7 +54,7 @@ if BUILD_DOCUMENTATION
endif
$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
rm -f $(DESTDIR)$(mandir)/man1/cacademo.1
- ln -sf cacafire.1 $(DESTDIR)$(mandir)/man1/cacademo.1
+ $(LN_S)f cacafire.1 $(DESTDIR)$(mandir)/man1/cacademo.1
uninstall-local:
rm -f $(DESTDIR)$(datadir)/doc/libcucul-dev
......@@ -6,5 +6,6 @@ diff -Naur libcaca-0.99.beta17.a/caca/caca.pc.in libcaca-0.99.beta17.b/caca/caca
Conflicts:
Libs: -L${libdir} -lcaca
-Libs.private: @ZLIB_LIBS@
-Cflags: -I${includedir}
+Libs.private: @ZLIB_LIBS@ @CACA_LIBS@
Cflags: -I${includedir}
+Cflags: -DCACA_STATIC -I${includedir}
--- libcaca/configure.orig 2010-02-08 14:46:58.000000000 +0100
+++ libcaca/configure 2010-08-09 17:46:59.000000000 +0200
@@ -16785,33 +16785,9 @@
done
if test "${ac_cv_my_have_cocoa}" = "yes"; then
- case x${target} in
- xpowerpc*darwin*)
- # 10.3 needed to link with X11
- MACOSX_SDK="${MACOSX_SDK:-/Developer/SDKs/MacOSX10.3.9.sdk}"
- GCC_VERSION="${GCC_VERSION:-3.3}"
- ARCH="${ARCH:--arch ppc}"
- MACOSX_SDK_CFLAGS="${MACOSX_SDK_CFLAGS:--nostdinc -isystem ${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSION} -isystem ${MACOSX_SDK}/usr/include}"
- MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CXXFLAGS:--nostdinc++ -I${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSION}/c++ -I${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSION}/c++/ppc-darwin -I${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSION}/c++/backward}"
- MACOSX_SDK_LDFLAGS="${MACOSX_SDK_LDFLAGS:--L${MACOSX_SDK}/usr/lib/gcc/darwin -L${MACOSX_SDK}/usr/lib/gcc/darwin/${GCC_VERSION} -L${MACOSX_SDK}/usr/lib}"
- ;;
- x*86_64*darwin*)
- MACOSX_SDK="${MACOSX_SDK:-/Developer/SDKs/MacOSX10.5.sdk}"
- GCC_VERSION="${GCC_VERSION:-4.0}"
- ARCH="${ARCH:--arch i386}"
- MACOSX_SDK_CFLAGS="${MACOSX_SDK_CFLAGS:--isysroot ${MACOSX_SDK}}"
- MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CXXFLAGS:-${MACOSX_SDK_CFLAGS}}"
- ;;
- x*86*darwin*)
- MACOSX_SDK="${MACOSX_SDK:-/Developer/SDKs/MacOSX10.6.sdk}"
- GCC_VERSION="${GCC_VERSION:-4.0}"
- ARCH="${ARCH:--arch i386}"
- MACOSX_SDK_CFLAGS="${MACOSX_SDK_CFLAGS:--isysroot ${MACOSX_SDK}}"
- MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CXXFLAGS:-${MACOSX_SDK_CFLAGS}}"
- ;;
- esac
- CC="${CC:-gcc-${GCC_VERSION}}"
- CXX="${CXX:-g++-${GCC_VERSION}}"
+ MACOSX_SDK=/Developer/SDKs/MacOSX10.5.sdk
+ MACOSX_SDK_CFLAGS="-isysroot ${MACOSX_SDK}"
+ MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CFLAGS}"
MACOSX_SDK_FRAMEWORKS="${MACOSX_SDK_FRAMEWORKS:--F${MACOSX_SDK}/System/Library/Frameworks}"
CPPFLAGS="${CPPFLAGS} ${ARCH} ${MACOSX_SDK_FRAMEWORKS}"
CFLAGS="${CFLAGS} ${MACOSX_SDK_CFLAGS}"
--- libcaca/caca/caca.h 2010-02-08 13:34:28.000000000 +0100
+++ libcaca.new/caca/caca.h 2010-08-24 19:27:39.000000000 +0200
@@ -31,7 +31,7 @@
#if defined _DOXYGEN_SKIP_ME
#elif defined _WIN32 && defined __LIBCACA__ && defined DLL_EXPORT
# define __extern extern __declspec(dllexport)
-#elif defined _WIN32 && !defined __LIBCACA__
+#elif defined _WIN32 && !defined __LIBCACA__ && defined __NULL
# define __extern extern __declspec(dllimport)
#else
# define __extern extern
# CACA
CACA_VERSION := 0.99.beta17
CACA_URL := http://caca.zoy.org/files/libcaca/libcaca-$(CACA_VERSION).tar.gz
CACA_VERSION := 0.99.beta20
CACA_URL := https://github.com/cacalabs/libcaca/releases/download/v$(CACA_VERSION)/libcaca-$(CACA_VERSION).tar.gz
ifndef HAVE_DARWIN_OS
ifndef HAVE_LINUX # see VLC Trac 17251
......@@ -10,7 +10,7 @@ endif
endif
endif
ifeq ($(call need_pkg,"caca >= 0.99.beta14"),)
ifeq ($(call need_pkg,"caca >= 0.99.beta19"),)
PKGS_FOUND += caca
endif
......@@ -22,10 +22,6 @@ $(TARBALLS)/libcaca-$(CACA_VERSION).tar.gz:
caca: libcaca-$(CACA_VERSION).tar.gz .sum-caca
$(UNPACK)
$(APPLY) $(SRC)/caca/caca-fix-compilation-llvmgcc.patch
$(APPLY) $(SRC)/caca/caca-llvm-weak-alias.patch
$(APPLY) $(SRC)/caca/caca-osx-sdkofourchoice.patch
$(APPLY) $(SRC)/caca/caca-win32-static.patch
$(APPLY) $(SRC)/caca/caca-fix-ln-call.patch
$(APPLY) $(SRC)/caca/caca-fix-pkgconfig.patch
$(call pkg_static,"caca/caca.pc.in")
$(UPDATE_AUTOCONFIG)
......@@ -36,22 +32,36 @@ CACA_CONF := \
--disable-gl \
--disable-imlib2 \
--disable-doc \
--disable-cppunit \
--disable-zzuf \
--disable-ruby \
--disable-csharp \
--disable-cxx \
--disable-java
--disable-java \
--disable-python \
--disable-cocoa \
--disable-network \
--disable-vga \
--disable-imlib2
ifdef HAVE_MACOSX
CACA_CONF += --disable-x11
endif
ifdef HAVE_WIN32
CACA_CONF += --disable-ncurses
CACA_CONF += --disable-ncurses \
ac_cv_func_vsnprintf_s=yes \
ac_cv_func_sprintf_s=yes
endif
ifdef HAVE_LINUX
CACA_CONF += --disable-ncurses
endif
CACA_CONF += \
MACOSX_SDK=$(MACOSX_SDK) \
MACOSX_SDK_CFLAGS=" " \
MACOSX_SDK_CXXFLAGS=" " \
CPPFLAGS="$(CPPFLAGS) -DCACA_STATIC"
.caca: caca
$(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(CACA_CONF)
cd $< && $(MAKE) -C $< install
touch $@
......@@ -48,9 +48,9 @@
/* */
typedef struct vout_display_sys_t {
cucul_canvas_t *cv;
caca_canvas_t *cv;
caca_display_t *dp;
cucul_dither_t *dither;
caca_dither_t *dither;
bool dead;
vlc_queue_t q;
......@@ -97,8 +97,8 @@ static void Place(vout_display_t *vd)
{
vout_display_sys_t *sys = vd->sys;
const int canvas_width = cucul_get_canvas_width(sys->cv);
const int canvas_height = cucul_get_canvas_height(sys->cv);
const int canvas_width = caca_get_canvas_width(sys->cv);
const int canvas_height = caca_get_canvas_height(sys->cv);
const int display_width = caca_get_display_width(sys->dp);
const int display_height = caca_get_display_height(sys->dp);
......@@ -129,7 +129,7 @@ static void Prepare(vout_display_t *vd, picture_t *picture,
if (!sys->dither) {
/* Create the libcaca dither object */
sys->dither = cucul_create_dither(32,
sys->dither = caca_create_dither(32,
vd->source->i_visible_width,
vd->source->i_visible_height,
picture->p[0].i_pitch,
......@@ -144,12 +144,12 @@ static void Prepare(vout_display_t *vd, picture_t *picture,
}
}
cucul_set_color_ansi(sys->cv, CUCUL_COLOR_DEFAULT, CUCUL_COLOR_BLACK);
cucul_clear_canvas(sys->cv);
caca_set_color_ansi(sys->cv, CACA_DEFAULT, CACA_BLACK);
caca_clear_canvas(sys->cv);
const int crop_offset = vd->source->i_y_offset * picture->p->i_pitch +
vd->source->i_x_offset * picture->p->i_pixel_pitch;
cucul_dither_bitmap(sys->cv, sys->place.x, sys->place.y,
caca_dither_bitmap(sys->cv, sys->place.x, sys->place.y,
sys->place.width, sys->place.height,
sys->dither,
&picture->p->p_pixels[crop_offset]);
......@@ -177,7 +177,7 @@ static int Control(vout_display_t *vd, int query)
switch (query) {
case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
if (sys->dither)
cucul_free_dither(sys->dither);
caca_free_dither(sys->dither);
sys->dither = NULL;
/* fall through */
case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
......@@ -358,9 +358,9 @@ static void Close(vout_display_t *vd)
vlc_join(sys->thread, NULL);
if (sys->dither)
cucul_free_dither(sys->dither);
caca_free_dither(sys->dither);
caca_free_display(sys->dp);
cucul_free_canvas(sys->cv);
caca_free_canvas(sys->cv);
#if defined(_WIN32)
FreeConsole();
......@@ -449,9 +449,9 @@ static int Open(vout_display_t *vd,
if (!sys)
goto error;
sys->cv = cucul_create_canvas(0, 0);
sys->cv = caca_create_canvas(0, 0);
if (!sys->cv) {
msg_Err(vd, "cannot initialize libcucul");
msg_Err(vd, "cannot initialize libcaca");
goto error;
}
......@@ -503,11 +503,11 @@ static int Open(vout_display_t *vd,
error:
if (sys) {
if (sys->dither)
cucul_free_dither(sys->dither);
caca_free_dither(sys->dither);
if (sys->dp)
caca_free_display(sys->dp);
if (sys->cv)
cucul_free_canvas(sys->cv);
caca_free_canvas(sys->cv);
free(sys);
}
......