diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-09 10:55:19 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-09 10:55:19 -0300 |
commit | 149750d28420a7b59fab5501ab9aaca095f6fa46 (patch) | |
tree | b263a29e10663635bb00dff7dde4c7c7ac8f30d7 /community/linphone | |
parent | 1c0a9e2b2298f550629181080e63053fcb440743 (diff) | |
parent | 7a3611f5caa5e34c1f2b582640f97b733110ae63 (diff) |
Lots of removed PKGBUILDs, kept mplayer2
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/vdrift/PKGBUILD
community/acpitool/PKGBUILD
community/amaya/PKGBUILD
community/apparix/PKGBUILD
community/avant-window-navigator/PKGBUILD
community/awn-extras-applets/PKGBUILD
community/bmpanel/PKGBUILD
community/clipgrab/PKGBUILD
community/compizconfig-backend-kconfig4/PKGBUILD
community/conkeror-git/PKGBUILD
community/cross-arm-elf-binutils/PKGBUILD
community/cross-arm-elf-gcc-base/PKGBUILD
community/cross-arm-wince-cegcc-binutils/PKGBUILD
community/cross-arm-wince-cegcc-cegccdll-dummy/PKGBUILD
community/cross-arm-wince-cegcc-cegccdll/PKGBUILD
community/cross-arm-wince-cegcc-cegccthrddll/PKGBUILD
community/cross-arm-wince-cegcc-gcc-base/PKGBUILD
community/cross-arm-wince-cegcc-gcc/PKGBUILD
community/cross-arm-wince-cegcc-libstdcppdll/PKGBUILD
community/cross-arm-wince-cegcc-newlib/PKGBUILD
community/cross-arm-wince-cegcc-profile/PKGBUILD
community/cross-arm-wince-cegcc-w32api/PKGBUILD
community/dar/PKGBUILD
community/driftnet/PKGBUILD
community/duff/PKGBUILD
community/dvdstyler/PKGBUILD
community/eiciel/PKGBUILD
community/emesene/PKGBUILD
community/eterm/PKGBUILD
community/extrema/PKGBUILD
community/fail2ban/PKGBUILD
community/fgetty/PKGBUILD
community/fio/PKGBUILD
community/flvstreamer/PKGBUILD
community/fotoxx/PKGBUILD
community/ghdl/PKGBUILD
community/gnofract4d/PKGBUILD
community/gnome-do/PKGBUILD
community/grass/PKGBUILD
community/gri/PKGBUILD
community/gromacs/PKGBUILD
community/gtk-gnutella/PKGBUILD
community/gtk-rezlooks-engine/PKGBUILD
community/handbrake/PKGBUILD
community/jogl/PKGBUILD
community/kydpdict/PKGBUILD
community/libast/PKGBUILD
community/libcgi/PKGBUILD
community/libxnvctrl/PKGBUILD
community/mhwaveedit/PKGBUILD
community/microblog-purple/PKGBUILD
community/mms_client/PKGBUILD
community/mplayer2/PKGBUILD
community/multiget/PKGBUILD
community/multimux/PKGBUILD
community/musescore/PKGBUILD
community/mysql-ruby/PKGBUILD
community/mysql-workbench/PKGBUILD
community/nas/PKGBUILD
community/ocaml-extlib/PKGBUILD
community/ocaml-ounit/PKGBUILD
community/paraview/fix-boost-graph-api-changes.diff
community/pcb/PKGBUILD
community/pdftrans/PKGBUILD
community/python-daap/PKGBUILD
community/python2-cheetah/PKGBUILD
community/qdevelop/PKGBUILD
community/qtoctave/PKGBUILD
community/rep-gtk/PKGBUILD
community/sauerbraten/PKGBUILD
community/sawfish/PKGBUILD
community/scilab/PKGBUILD
community/superswitcher/PKGBUILD
community/tagtool/PKGBUILD
community/tora/PKGBUILD
community/wml/PKGBUILD
community/wxsvg/PKGBUILD
community/xskat/PKGBUILD
core/eglibc/glibc.install
core/eglibc/locale-gen
core/eglibc/locale.gen.txt
core/eglibc/nscd
core/syslog-ng/PKGBUILD
extra/blender/PKGBUILD
extra/cups/PKGBUILD
extra/hplip/PKGBUILD
extra/kile/PKGBUILD
extra/monodevelop-debugger-mdb/PKGBUILD
extra/perl-ev/PKGBUILD
multilib/lib32-qt/PKGBUILD
testing/kaffeine/kaffeine.install
testing/kdebase-runtime/PKGBUILD
testing/kdebase-runtime/kdebase-runtime.install
testing/kdebase-runtime/libqzeitgeist08.patch
testing/libdrm/PKGBUILD
testing/libdrm/no-pthread-stubs.patch
Diffstat (limited to 'community/linphone')
-rw-r--r-- | community/linphone/disable-v4l1.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/community/linphone/disable-v4l1.patch b/community/linphone/disable-v4l1.patch deleted file mode 100644 index 9f6cb84d4..000000000 --- a/community/linphone/disable-v4l1.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.am linphone-3.4.3.my/mediastreamer2/src/Makefile.am ---- linphone-3.4.3/mediastreamer2/src/Makefile.am 2011-02-09 08:43:11.000000000 +0000 -+++ linphone-3.4.3.my/mediastreamer2/src/Makefile.am 2011-04-01 14:54:04.000000000 +0000 -@@ -117,7 +117,7 @@ - endif - - if BUILD_V4L --libmediastreamer_la_SOURCES+=msv4l.c msv4l2.c -+libmediastreamer_la_SOURCES+=msv4l2.c - endif - - if BUILD_WIN32 -diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.in linphone-3.4.3.my/mediastreamer2/src/Makefile.in ---- linphone-3.4.3/mediastreamer2/src/Makefile.in 2011-03-28 18:34:07.000000000 +0000 -+++ linphone-3.4.3.my/mediastreamer2/src/Makefile.in 2011-04-01 14:55:00.000000000 +0000 -@@ -54,7 +54,7 @@ - @BUILD_MACAQSND_TRUE@am__append_12 = aqsnd.c - @BUILD_PULSEAUDIO_TRUE@am__append_13 = pulseaudio.c - @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__append_14 = msv4m.m --@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l.c msv4l2.c -+@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l2.c - @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__append_16 = msdscap-mingw.cc drawdib-display.c - @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__append_17 = theora.c - @BUILD_FFMPEG_TRUE@@BUILD_VIDEO_TRUE@am__append_18 = videoenc.c \ -@@ -135,7 +135,7 @@ - audiostream.c msspeex.c speexec.c gsm.c winsnd3.c \ - msfileplayer_win.c msfilerec_win.c msfileplayer.c msfilerec.c \ - msresample.c alsa.c oss.c arts.c pasnd.c macsnd.c msiounit.c \ -- aqsnd.c pulseaudio.c msv4m.m msv4l.c msv4l2.c msdscap-mingw.cc \ -+ aqsnd.c pulseaudio.c msv4m.m msv4l2.c msdscap-mingw.cc \ - drawdib-display.c theora.c videoenc.c videodec.c pixconv.c \ - sizeconv.c nowebcam.c nowebcam.h swscale.h ffmpeg-priv.h \ - h264dec.c jpegwriter.c videoout.c x11video.c rfc2429.h \ -@@ -156,7 +156,7 @@ - @BUILD_MACAQSND_TRUE@am__objects_12 = aqsnd.lo - @BUILD_PULSEAUDIO_TRUE@am__objects_13 = pulseaudio.lo - @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__objects_14 = msv4m.lo --@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l.lo msv4l2.lo -+@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l2.lo - @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__objects_16 = msdscap-mingw.lo \ - @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@ drawdib-display.lo - @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__objects_17 = theora.lo -@@ -600,7 +600,6 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mssndcard.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msspeex.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msticker.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l2.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4m.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvideo.Plo@am__quote@ |