summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-misc/electricsheep/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-misc/electricsheep/files')
-rw-r--r--x11-misc/electricsheep/files/electricsheep-2.7_beta11-asneeded.patch13
-rw-r--r--x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg1.patch37
-rw-r--r--x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg2.patch32
-rw-r--r--x11-misc/electricsheep/files/electricsheep-ffmpeg.patch41
-rw-r--r--x11-misc/electricsheep/files/electricsheep-gnome.patch25
-rw-r--r--x11-misc/electricsheep/files/electricsheep-xdg-utils.patch15
6 files changed, 163 insertions, 0 deletions
diff --git a/x11-misc/electricsheep/files/electricsheep-2.7_beta11-asneeded.patch b/x11-misc/electricsheep/files/electricsheep-2.7_beta11-asneeded.patch
new file mode 100644
index 000000000000..70f746d5ff8b
--- /dev/null
+++ b/x11-misc/electricsheep/files/electricsheep-2.7_beta11-asneeded.patch
@@ -0,0 +1,13 @@
+diff -ur electricsheep-2.7_beta11.orig/Makefile.am electricsheep-2.7_beta11/Makefile.am
+--- electricsheep-2.7_beta11.orig/Makefile.am 2009-09-18 00:42:49.000000000 +0300
++++ electricsheep-2.7_beta11/Makefile.am 2010-02-26 14:35:07.000000000 +0200
+@@ -9,7 +9,8 @@
+ pkgdata_DATA = electricsheep-wait.avi electricsheep-preferences.glade
+
+ electricsheep_preferences_CFLAGS = @libglade_CFLAGS@ -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\"
+-electricsheep_preferences_LDFLAGS = @libglade_LIBS@ -export-dynamic
++electricsheep_preferences_LDADD = @libglade_LIBS@
++electricsheep_preferences_LDFLAGS = -export-dynamic
+ electricsheep_preferences_SOURCES = electricsheep-preferences.c utils.c md5.c
+
+
diff --git a/x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg1.patch b/x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg1.patch
new file mode 100644
index 000000000000..aa5fd179ebfe
--- /dev/null
+++ b/x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg1.patch
@@ -0,0 +1,37 @@
+Index: electricsheep-2.7_beta11/electricsheep.c
+===================================================================
+--- electricsheep-2.7_beta11.orig/electricsheep.c
++++ electricsheep-2.7_beta11/electricsheep.c
+@@ -652,7 +652,7 @@ void copy_out_file(char *fname) {
+ return;
+ }
+
+- if (0 > av_open_input_file(&ictx, fname, NULL, 0, NULL)) {
++ if (0 > avformat_open_input(&ictx, fname, NULL, NULL)) {
+ perror(fname);
+ exit(1);
+ }
+@@ -699,8 +699,6 @@ void copy_out_file(char *fname) {
+ output_ctx->oformat = ofmt;
+
+ st = av_new_stream(output_ctx, output_ctx->nb_streams);
+- st->stream_copy = 1;
+- av_set_parameters(output_ctx, NULL);
+
+ icodec = ictx->streams[input_stream_index]->codec;
+ codec = output_ctx->streams[0]->codec;
+@@ -718,12 +716,12 @@ void copy_out_file(char *fname) {
+ codec->height = icodec->height;
+ codec->has_b_frames = icodec->has_b_frames;
+
+- if (url_fopen(&output_ctx->pb, pipe, URL_WRONLY) < 0) {
++ if (avio_open(&output_ctx->pb, pipe, AVIO_FLAG_WRITE) < 0) {
+ fprintf(logout, "Could not open '%s'\n", pipe);
+ exit(1);
+ }
+
+- av_write_header(output_ctx);
++ avformat_write_header(output_ctx, NULL);
+ }
+
+ while (1) {
diff --git a/x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg2.patch b/x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg2.patch
new file mode 100644
index 000000000000..d08f3b0c5f00
--- /dev/null
+++ b/x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg2.patch
@@ -0,0 +1,32 @@
+Index: electricsheep-2.7_beta11/electricsheep.c
+===================================================================
+--- electricsheep-2.7_beta11.orig/electricsheep.c
++++ electricsheep-2.7_beta11/electricsheep.c
+@@ -657,7 +657,7 @@ void copy_out_file(char *fname) {
+ exit(1);
+ }
+
+- if (0 > av_find_stream_info(ictx)) {
++ if (0 > avformat_find_stream_info(ictx, NULL)) {
+ fprintf(logout, "%s: could not find codec parameters\n", fname);
+ exit(1);
+ }
+@@ -698,7 +698,8 @@ void copy_out_file(char *fname) {
+ }
+ output_ctx->oformat = ofmt;
+
+- st = av_new_stream(output_ctx, output_ctx->nb_streams);
++ st = avformat_new_stream(output_ctx, NULL);
++ if(st) st->id = output_ctx->nb_streams;
+
+ icodec = ictx->streams[input_stream_index]->codec;
+ codec = output_ctx->streams[0]->codec;
+@@ -741,7 +742,7 @@ void copy_out_file(char *fname) {
+ av_free_packet(&opkt);
+ av_free_packet(&ipkt);
+ }
+- av_close_input_file(ictx);
++ avformat_close_input(&ictx);
+ }
+
+ time_t search_time;
diff --git a/x11-misc/electricsheep/files/electricsheep-ffmpeg.patch b/x11-misc/electricsheep/files/electricsheep-ffmpeg.patch
new file mode 100644
index 000000000000..d40c171cb221
--- /dev/null
+++ b/x11-misc/electricsheep/files/electricsheep-ffmpeg.patch
@@ -0,0 +1,41 @@
+Index: electricsheep-2.7_beta11/electricsheep.c
+===================================================================
+--- electricsheep-2.7_beta11.orig/electricsheep.c
++++ electricsheep-2.7_beta11/electricsheep.c
+@@ -61,6 +61,9 @@
+ #define STATFS statfs
+ #endif
+
++#ifndef guess_format
++#define guess_format av_guess_format
++#endif
+
+ prefs_t prefs;
+
+@@ -662,7 +665,7 @@ void copy_out_file(char *fname) {
+ input_stream_index = -1;
+ for (j = 0; j < ictx->nb_streams; j++) {
+ AVCodecContext *enc = ictx->streams[j]->codec;
+- if (CODEC_TYPE_VIDEO == enc->codec_type) {
++ if (AVMEDIA_TYPE_VIDEO == enc->codec_type) {
+ input_stream_index = j;
+ break;
+ }
+@@ -686,7 +689,7 @@ void copy_out_file(char *fname) {
+ }
+ }
+
+- output_ctx = av_alloc_format_context();
++ output_ctx = avformat_alloc_context();
+
+ ofmt = guess_format(NULL, fname, NULL);
+ if (!ofmt) {
+@@ -730,7 +733,7 @@ void copy_out_file(char *fname) {
+ av_init_packet(&opkt);
+ if (av_parser_change(ictx->streams[input_stream_index]->parser, output_ctx->streams[0]->codec,
+ &opkt.data, &opkt.size, ipkt.data, ipkt.size,
+- ipkt.flags & PKT_FLAG_KEY))
++ ipkt.flags & AV_PKT_FLAG_KEY))
+ opkt.destruct= av_destruct_packet;
+
+ if (-1 == av_interleaved_write_frame(output_ctx, &opkt)) {
diff --git a/x11-misc/electricsheep/files/electricsheep-gnome.patch b/x11-misc/electricsheep/files/electricsheep-gnome.patch
new file mode 100644
index 000000000000..bea649edb0bd
--- /dev/null
+++ b/x11-misc/electricsheep/files/electricsheep-gnome.patch
@@ -0,0 +1,25 @@
+Index: client/Makefile.am
+===================================================================
+--- client/Makefile.am (revision 1257)
++++ client/Makefile.am (working copy)
+@@ -28,20 +28,3 @@
+ electricsheep-preferences.glade electricsheep.h electricsheep-saver \
+ 16_electricsheep
+
+-GNOME_SCREENSAVER_DATADIR = $(shell pkg-config --variable themesdir gnome-screensaver)
+-GNOME_SCREENSAVER_PRIVEXEDIR = $(shell pkg-config --variable privlibexecdir gnome-screensaver)
+-
+-install-data-local:
+- -$(INSTALL) electricsheep.desktop $(GNOME_SCREENSAVER_DATADIR)
+- -$(INSTALL) electricsheep-saver $(GNOME_SCREENSAVER_PRIVEXEDIR)
+- -$(INSTALL) -d $(pkgdatadir)
+- -$(INSTALL) 16_electricsheep /usr/share/gconf/defaults
+- -update-gconf-defaults
+-
+-uninstall-local:
+- -rm /usr/share/gconf/defaults/16_electricsheep
+- -rm -rf $(pkgdatadir)
+- -rm $(GNOME_SCREENSAVER_PRIVEXEDIR)/electricsheep-saver
+- -rm $(GNOME_SCREENSAVER_DATADIR)/electricsheep.desktop
+- -update-gconf-defaults
+-
diff --git a/x11-misc/electricsheep/files/electricsheep-xdg-utils.patch b/x11-misc/electricsheep/files/electricsheep-xdg-utils.patch
new file mode 100644
index 000000000000..4ca38158c741
--- /dev/null
+++ b/x11-misc/electricsheep/files/electricsheep-xdg-utils.patch
@@ -0,0 +1,15 @@
+Index: client/electricsheep-preferences.c
+===================================================================
+--- client/electricsheep-preferences.c (revision 1257)
++++ client/electricsheep-preferences.c (working copy)
+@@ -121,8 +121,8 @@
+ }
+
+ void on_helpButton_clicked(GtkWidget *widget, gpointer user_data) {
+- if (system("gnome-open http://electricsheep.org/client/LNX_" VERSION ".html &"))
+- perror("gnome-open");
++ if (system("xdg-open http://electricsheep.org/client/LNX_" VERSION ".html &"))
++ perror("xdg-open");
+ }
+
+ static void tick() {