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

1 files changed, 0 insertions, 45 deletions

diff --git a/extra/avidemux/avidemux-2.5.4-x264-build115.patch b/extra/avidemux/avidemux-2.5.4-x264-build115.patch
deleted file mode 100644
index c627667ec..000000000
--- a/extra/avidemux/avidemux-2.5.4-x264-build115.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp	2011-04-28 22:35:36.000000000 +0200
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp	2011-04-28 22:40:26.000000000 +0200
-@@ -488,8 +488,10 @@
- 	printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8);

- 	printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter);

- 	printf("[x264] b_cabac = %d\n", x264Param->b_cabac);

--#if X264_BUILD > 101

-+#if X264_BUILD > 101 && X264_BUILD < 115

- 	printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop);

-+#elif X264_BUILD > 114

-+	printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop);

- #endif

- 	printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced);

- #if X264_BUILD > 88

-diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-04-28 22:35:36.000000000 +0200
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-04-28 22:43:36.000000000 +0200
-@@ -417,7 +417,7 @@
- 	_param.b_cabac = cabac;

- }

- 

--#if X264_BUILD > 101

-+#if X264_BUILD > 101 && X264_BUILD < 115

- unsigned int x264Options::getOpenGopMode(void)

- {

- 	return _param.i_open_gop;

-@@ -428,6 +428,17 @@
- 	if (openGopMode < 3)

- 		_param.i_open_gop = openGopMode;

- }

-+#elif X264_BUILD > 114

-+unsigned int x264Options::getOpenGopMode(void)

-+{

-+        return _param.b_open_gop;

-+}

-+ 

-+void x264Options::setOpenGopMode(unsigned int openGopMode)

-+{

-+        if (openGopMode < 3)

-+                _param.b_open_gop = openGopMode;

-+}

- #endif

- 

- unsigned int x264Options::getInterlaced(void)