rpms/xv/devel xv-3.10a-libpng15.patch,NONE,1.1 xv.spec,1.7,1.8
by Paul Howarth
Author: pghmcfc
Update of /cvs/nonfree/rpms/xv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2840
Modified Files:
xv.spec
Added Files:
xv-3.10a-libpng15.patch
Log Message:
add patch from Gentoo for libpng 1.5 compatibility
xv-3.10a-libpng15.patch:
xvinfo.c | 2
xvpng.c | 194 +++++++++++++++++++++++++++++++++++++--------------------------
2 files changed, 117 insertions(+), 79 deletions(-)
--- NEW FILE xv-3.10a-libpng15.patch ---
--- xvinfo.c
+++ xvinfo.c
@@ -26,7 +26,7 @@
#define INFOHIGH 270
/* max length of an Info String */
-#define ISTRLEN 80
+#define ISTRLEN 256
/* baseline of top line of text */
#define TOPBASE (36 + penn_height/2 + 4 + 8 + ASCENT)
--- xvpng.c
+++ xvpng.c
@@ -31,6 +31,7 @@
#ifdef HAVE_PNG
+#include "zlib.h"
#include "png.h"
/*** Stuff for PNG Dialog box ***/
@@ -41,7 +42,9 @@
#define COMPRESSION 6 /* default zlib compression level, not max
(Z_BEST_COMPRESSION) */
-#define HAVE_tRNS (info_ptr->valid & PNG_INFO_tRNS)
+/* old
+#define HAVE_tRNS (info_ptr->valid & PNG_INFO_tRNS) */
+#define HAVE_tRNS png_get_valid(png_ptr,info_ptr,PNG_INFO_tRNS)
#define DWIDE 86
#define DHIGH 104
@@ -444,6 +447,10 @@
byte *p, *png_line;
char software[256];
char *savecmnt;
+ /* for storing values until all are accumulated, so that the image header can be set in full */
+ int _bit_depth,_color_type,_interlace_type,_compression_type,_filter_type;
+ png_uint_32 _width,_height;
+ png_time _mod_time;
if ((png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL,
png_xv_error, png_xv_warning)) == NULL) {
@@ -458,7 +465,7 @@
FatalError(software);
}
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
png_destroy_write_struct(&png_ptr, &info_ptr);
return -1;
}
@@ -489,8 +496,8 @@
png_set_filter(png_ptr, 0, filter);
}
- info_ptr->width = w;
- info_ptr->height = h;
+ _width = w;
+ _height = h;
if (w <= 0 || h <= 0) {
SetISTR(ISTR_WARNING, "%s: image dimensions out of range (%dx%d)",
fbasename, w, h);
@@ -498,7 +505,7 @@
return -1;
}
- info_ptr->interlace_type = interCB.val ? 1 : 0;
+ _interlace_type = interCB.val ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE;
linesize = 0; /* quiet a compiler warning */
@@ -542,40 +549,44 @@
png_destroy_write_struct(&png_ptr, &info_ptr);
return -1;
}
- info_ptr->color_type = PNG_COLOR_TYPE_RGB;
- info_ptr->bit_depth = 8;
+ _color_type = PNG_COLOR_TYPE_RGB;
+ _bit_depth = 8;
} else /* ptype == PIC8 */ {
linesize = w;
- info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
+ _color_type = PNG_COLOR_TYPE_PALETTE;
if (numuniqcols <= 2)
- info_ptr->bit_depth = 1;
+ _bit_depth = 1;
else
if (numuniqcols <= 4)
- info_ptr->bit_depth = 2;
+ _bit_depth = 2;
else
if (numuniqcols <= 16)
- info_ptr->bit_depth = 4;
+ _bit_depth = 4;
else
- info_ptr->bit_depth = 8;
+ _bit_depth = 8;
for (i = 0; i < numuniqcols; i++) {
palette[i].red = r1[i];
palette[i].green = g1[i];
palette[i].blue = b1[i];
}
- info_ptr->num_palette = numuniqcols;
- info_ptr->palette = palette;
+/* cannot find a setter for this, unsure if it is necessary anymore...
info_ptr->valid |= PNG_INFO_PLTE;
+*/
+ /* set the header just in case it's needed */
+ png_set_IHDR(png_ptr,info_ptr,_width,_height,_bit_depth,_color_type,
+ _interlace_type,PNG_COMPRESSION_TYPE_DEFAULT,PNG_FILTER_TYPE_DEFAULT);
+ png_set_PLTE(png_ptr,info_ptr,palette,numuniqcols);
}
}
else if (colorType == F_GREYSCALE || colorType == F_BWDITHER) {
- info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
+ _color_type = PNG_COLOR_TYPE_GRAY;
if (colorType == F_BWDITHER) {
/* shouldn't happen */
if (ptype == PIC24) FatalError("PIC24 and B/W Stipple in WritePNG()");
- info_ptr->bit_depth = 1;
+ _bit_depth = 1;
if (MONO(r1[0], g1[0], b1[0]) > MONO(r1[1], g1[1], b1[1])) {
remap[0] = 1;
remap[1] = 0;
@@ -595,7 +606,7 @@
png_destroy_write_struct(&png_ptr, &info_ptr);
return -1;
}
- info_ptr->bit_depth = 8;
+ _bit_depth = 8;
}
else /* ptype == PIC8 */ {
int low_precision;
@@ -617,7 +628,7 @@
for (; i < 256; i++)
remap[i]=0; /* shouldn't be necessary, but... */
- info_ptr->bit_depth = 8;
+ _bit_depth = 8;
/* Note that this fails most of the time because of gamma */
/* (and that would be a bug: GRR FIXME) */
@@ -636,7 +647,7 @@
for (i = 0; i < numuniqcols; i++) {
remap[i] &= 0xf;
}
- info_ptr->bit_depth = 4;
+ _bit_depth = 4;
/* try to adjust to 2-bit precision grayscale */
@@ -652,7 +663,7 @@
for (i = 0; i < numuniqcols; i++) {
remap[i] &= 3;
}
- info_ptr->bit_depth = 2;
+ _bit_depth = 2;
/* try to adjust to 1-bit precision grayscale */
@@ -668,7 +679,7 @@
for (i = 0; i < numuniqcols; i++) {
remap[i] &= 1;
}
- info_ptr->bit_depth = 1;
+ _bit_depth = 1;
}
}
}
@@ -677,6 +688,9 @@
else
png_error(png_ptr, "Unknown colorstyle in WritePNG");
+ png_set_IHDR(png_ptr,info_ptr,_width,_height,_bit_depth,_color_type,
+ _interlace_type,PNG_COMPRESSION_TYPE_DEFAULT,PNG_FILTER_TYPE_DEFAULT);
+
if ((text = (png_textp)malloc(sizeof(png_text)))) {
sprintf(software, "XV %s", REVDATE);
@@ -685,20 +699,22 @@
text->text = software;
text->text_length = strlen(text->text);
- info_ptr->max_text = 1;
- info_ptr->num_text = 1;
- info_ptr->text = text;
+/* max_text seems to be internal only now, do not set
+ info_ptr->max_text = 1; */
+ png_set_text(png_ptr,info_ptr,text,1);
}
Display_Gamma = gDial.val; /* Save the current gamma for loading */
// GRR FIXME: add .Xdefaults option to omit writing gamma (size, cumulative errors when editing)--alternatively, modify save box to include "omit" checkbox
- info_ptr->gamma = 1.0/gDial.val;
- info_ptr->valid |= PNG_INFO_gAMA;
+ png_set_gAMA(png_ptr,info_ptr,1.0/gDial.val);
+/* doesn't seem to be a way to set valid directly anymore, unnecessary maybe..
+ info_ptr->valid |= PNG_INFO_gAMA; */
+/* might need to be png_write_info_before_PLTE() ... */
png_write_info(png_ptr, info_ptr);
- if (info_ptr->bit_depth < 8)
+ if (_bit_depth < 8)
png_set_packing(png_ptr);
pass=png_set_interlace_handling(png_ptr);
@@ -711,13 +727,13 @@
int j;
p = pic;
for (j = 0; j < h; ++j) {
- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY) {
+ if (_color_type == PNG_COLOR_TYPE_GRAY) {
int k;
for (k = 0; k < w; ++k)
png_line[k] = ptype==PIC24 ? MONO(p[k*3], p[k*3+1], p[k*3+2]) :
remap[pc2nc[p[k]]];
png_write_row(png_ptr, png_line);
- } else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) {
+ } else if (_color_type == PNG_COLOR_TYPE_PALETTE) {
int k;
for (k = 0; k < w; ++k)
png_line[k] = pc2nc[p[k]];
@@ -739,28 +755,31 @@
(savecmnt = (char *)malloc((strlen(picComments) + 1)*sizeof(char)))) {
png_textp tp;
char *comment, *key;
+ int nt;
+ int mt;
strcpy(savecmnt, picComments);
key = savecmnt;
+ png_get_text(png_ptr,info_ptr,&tp,&mt); /* to get 'max_text' */
tp = text;
- info_ptr->num_text = 0;
+ nt = 0;
comment = strchr(key, ':');
do {
/* Allocate a larger structure for comments if necessary */
- if (info_ptr->num_text >= info_ptr->max_text)
+ if (nt >= mt)
{
if ((tp =
- realloc(text, (info_ptr->num_text + 2)*sizeof(png_text))) == NULL)
+ realloc(text, (nt + 2)*sizeof(png_text))) == NULL)
{
break;
}
else
{
text = tp;
- tp = &text[info_ptr->num_text];
- info_ptr->max_text += 2;
+ tp = &text[nt];
+ mt += 2;
}
}
@@ -810,7 +829,7 @@
}
tp->compression = tp->text_length > 640 ? 0 : -1;
- info_ptr->num_text++;
+ nt++;
tp++;
}
}
@@ -834,27 +853,29 @@
tp->text = key;
tp->text_length = q - key;
tp->compression = tp->text_length > 750 ? 0 : -1;
- info_ptr->num_text++;
+ nt++;
key = NULL;
}
} while (key && *key);
+ png_set_text(png_ptr,info_ptr,text,nt);
}
else {
- info_ptr->num_text = 0;
+ png_set_text(png_ptr,info_ptr,text,0);
}
}
- info_ptr->text = text;
- png_convert_from_time_t(&(info_ptr->mod_time), time(NULL));
- info_ptr->valid |= PNG_INFO_tIME;
+ png_convert_from_time_t(&_mod_time, time(NULL));
+ png_set_tIME(png_ptr,info_ptr,&_mod_time);
+/* dunno how to set validity
+ info_ptr->valid |= PNG_INFO_tIME; */
png_write_end(png_ptr, info_ptr);
fflush(fp); /* just in case we core-dump before finishing... */
if (text) {
free(text);
- /* must do this or png_destroy_write_struct() 0.97+ will free text again: */
- info_ptr->text = (png_textp)NULL;
+ /* must do this or png_destroy_write_struct() 0.97+ will free text again:
+ info_ptr->text = (png_textp)NULL; */
if (savecmnt)
{
free(savecmnt);
@@ -886,6 +907,14 @@
int pass;
int gray_to_rgb;
size_t commentsize;
+ /* temp storage vars for libpng15 migration */
+ int _bit_depth,_color_type,_interlace_type,_compression_type,_filter_type,_num_text,_num_palette;
+ png_uint_32 _width,_height;
+ png_timep _mod_time;
+ double _gamma;
+ png_textp _text;
+ png_colorp _palette;
+ png_color_16p _background;
fbasename = BaseName(fname);
@@ -921,7 +950,7 @@
FatalError("malloc failure in LoadPNG");
}
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
fclose(fp);
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
if (!read_anything) {
@@ -945,8 +974,10 @@
#endif
png_read_info(png_ptr, info_ptr);
- pinfo->w = pinfo->normw = info_ptr->width;
- pinfo->h = pinfo->normh = info_ptr->height;
+ png_get_IHDR(png_ptr,info_ptr,&_width,&_height,&_bit_depth,&_color_type,&_interlace_type,NULL,NULL);
+
+ pinfo->w = pinfo->normw = _width;
+ pinfo->h = pinfo->normh = _height;
if (pinfo->w <= 0 || pinfo->h <= 0) {
SetISTR(ISTR_WARNING, "%s: image dimensions out of range (%dx%d)",
fbasename, pinfo->w, pinfo->h);
@@ -957,9 +988,9 @@
pinfo->frmType = F_PNG;
sprintf(pinfo->fullInfo, "PNG, %d bit ",
- info_ptr->bit_depth * info_ptr->channels);
+ _bit_depth * png_get_channels(png_ptr,info_ptr));
- switch(info_ptr->color_type) {
+ switch(_color_type) {
case PNG_COLOR_TYPE_PALETTE:
strcat(pinfo->fullInfo, "palette color");
break;
@@ -983,15 +1014,17 @@
sprintf(pinfo->fullInfo + strlen(pinfo->fullInfo),
", %sinterlaced. (%d bytes)",
- info_ptr->interlace_type ? "" : "non-", filesize);
+ _interlace_type ? "" : "non-", filesize);
- sprintf(pinfo->shrtInfo, "%lux%lu PNG", info_ptr->width, info_ptr->height);
+ sprintf(pinfo->shrtInfo, "%lux%lu PNG", _width, _height);
- if (info_ptr->bit_depth < 8)
+ if (_bit_depth < 8)
png_set_packing(png_ptr);
- if (info_ptr->valid & PNG_INFO_gAMA)
- png_set_gamma(png_ptr, Display_Gamma, info_ptr->gamma);
+ if (png_get_valid(png_ptr,info_ptr,PNG_INFO_gAMA)) {
+ png_get_gAMA(png_ptr,info_ptr,&_gamma);
+ png_set_gamma(png_ptr, Display_Gamma, _gamma);
+ }
/*
*else
* png_set_gamma(png_ptr, Display_Gamma, 0.45);
@@ -1000,7 +1033,7 @@
gray_to_rgb = 0; /* quiet a compiler warning */
if (have_imagebg) {
- if (info_ptr->bit_depth == 16) {
+ if (_bit_depth == 16) {
my_background.red = imagebgR;
my_background.green = imagebgG;
my_background.blue = imagebgB;
@@ -1013,8 +1046,8 @@
}
png_set_background(png_ptr, &my_background, PNG_BACKGROUND_GAMMA_SCREEN,
0, Display_Gamma);
- if ((info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA ||
- (info_ptr->color_type == PNG_COLOR_TYPE_GRAY && HAVE_tRNS)) &&
+ if ((_color_type == PNG_COLOR_TYPE_GRAY_ALPHA ||
+ (_color_type == PNG_COLOR_TYPE_GRAY && HAVE_tRNS)) &&
(imagebgR != imagebgG || imagebgR != imagebgB)) /* i.e., colored bg */
{
png_set_gray_to_rgb(png_ptr);
@@ -1022,8 +1055,9 @@
gray_to_rgb = 1;
}
} else {
- if (info_ptr->valid & PNG_INFO_bKGD) {
- png_set_background(png_ptr, &info_ptr->background,
+ if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) {
+ png_get_bKGD(png_ptr,info_ptr,&_background);
+ png_set_background(png_ptr, _background,
PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
} else {
my_background.red = my_background.green = my_background.blue =
@@ -1033,13 +1067,13 @@
}
}
- if (info_ptr->bit_depth == 16)
+ if (_bit_depth == 16)
png_set_strip_16(png_ptr);
- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY ||
- info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+ if (_color_type == PNG_COLOR_TYPE_GRAY ||
+ _color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
{
- if (info_ptr->bit_depth == 1)
+ if (_bit_depth == 1)
pinfo->colType = F_BWDITHER;
else
pinfo->colType = F_GREYSCALE;
@@ -1049,9 +1083,11 @@
pass=png_set_interlace_handling(png_ptr);
png_read_update_info(png_ptr, info_ptr);
+ /* get HIDR again just in case the info_ptr changed */
+ png_get_IHDR(png_ptr,info_ptr,&_width,&_height,&_bit_depth,&_color_type,&_interlace_type,NULL,NULL);
- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB ||
- info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA || gray_to_rgb)
+ if (_color_type == PNG_COLOR_TYPE_RGB ||
+ _color_type == PNG_COLOR_TYPE_RGB_ALPHA || gray_to_rgb)
{
linesize = 3 * pinfo->w;
if (linesize/3 < pinfo->w) { /* know pinfo->w > 0 (see above) */
@@ -1065,16 +1101,17 @@
} else {
linesize = pinfo->w;
pinfo->type = PIC8;
- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY ||
- info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
+ if (_color_type == PNG_COLOR_TYPE_GRAY ||
+ _color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
for (i = 0; i < 256; i++)
pinfo->r[i] = pinfo->g[i] = pinfo->b[i] = i;
} else {
pinfo->colType = F_FULLCOLOR;
- for (i = 0; i < info_ptr->num_palette; i++) {
- pinfo->r[i] = info_ptr->palette[i].red;
- pinfo->g[i] = info_ptr->palette[i].green;
- pinfo->b[i] = info_ptr->palette[i].blue;
+ png_get_PLTE(png_ptr,info_ptr,&_palette,&_num_palette);
+ for (i = 0; i < _num_palette; i++) {
+ pinfo->r[i] = _palette[i].red;
+ pinfo->g[i] = _palette[i].green;
+ pinfo->b[i] = _palette[i].blue;
}
}
}
@@ -1092,7 +1129,7 @@
png_error(png_ptr, "can't allocate space for PNG image");
}
- png_start_read_image(png_ptr);
+ /*png_start_read_image(png_ptr); -- causes a warning and seems to be unnecessary */
for (i = 0; i < pass; i++) {
byte *p = pinfo->pic;
@@ -1106,22 +1143,23 @@
png_read_end(png_ptr, info_ptr);
- if (info_ptr->num_text > 0) {
+ png_get_text(png_ptr,info_ptr,&_text,&_num_text);
+ if (_num_text > 0) {
commentsize = 1;
- for (i = 0; i < info_ptr->num_text; i++)
- commentsize += strlen(info_ptr->text[i].key) + 1 +
- info_ptr->text[i].text_length + 2;
+ for (i = 0; i < _num_text; i++)
+ commentsize += strlen(_text[i].key) + 1 +
+ _text[i].text_length + 2;
if ((pinfo->comment = malloc(commentsize)) == NULL) {
png_warning(png_ptr,"can't allocate comment string");
}
else {
pinfo->comment[0] = '\0';
- for (i = 0; i < info_ptr->num_text; i++) {
- strcat(pinfo->comment, info_ptr->text[i].key);
+ for (i = 0; i < _num_text; i++) {
+ strcat(pinfo->comment, _text[i].key);
strcat(pinfo->comment, "::");
- strcat(pinfo->comment, info_ptr->text[i].text);
+ strcat(pinfo->comment, _text[i].text);
strcat(pinfo->comment, "\n");
}
}
@@ -1143,7 +1181,7 @@
{
SetISTR(ISTR_WARNING,"%s: libpng error: %s", fbasename, message);
- longjmp(png_ptr->jmpbuf, 1);
+ longjmp(png_jmpbuf(png_ptr), 1);
}
Index: xv.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xv/devel/xv.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xv.spec 8 Sep 2011 00:47:27 -0000 1.7
+++ xv.spec 9 Dec 2011 14:17:10 -0000 1.8
@@ -3,7 +3,7 @@
Name: xv
Version: %{vprog}.jumbopatch.%{vjumbo}
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Interactive image display program for X
Summary(de.UTF-8): X-basierender Bild-Viewer für praktische sämtliche Grafiken
Summary(es.UTF-8): Visualizador de imágenes para X para cuasi todos los formatos de imágenes
@@ -28,6 +28,7 @@
Patch2: xv-3.10a-cleanup.patch
Patch3: xv-FLmask.v2.1.patch
Patch4: xv-wait.patch
+Patch5: xv-3.10a-libpng15.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtiff-devel libpng-devel jasper-devel desktop-file-utils
%if "%{?rhel}" != "4"
@@ -138,6 +139,9 @@
# replace CLK_TCK with sysconf(_SC_CLK_TCK)
%patch4 -p1
+# libpng 1.5 compatibility
+%patch5 -p0
+
# Include permission to distribute
%{__install} -m 0644 -p %{SOURCE2} .
@@ -273,6 +277,9 @@
%doc %{_docdir}/%{name}-%{vprog}/manuals/
%changelog
+* Fri Dec 9 2011 Paul Howarth <paul(a)city-fan.org> 3.10a.jumbopatch.20070520-13
+- add patch from Gentoo for libpng 1.5 compatibility
+
* Wed Sep 07 2011 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-12
- fix wait timer (BZ 1929, thanks to Sjoerd Mullender <sjoerd(a)acm.org>)
12 years, 11 months
rpms/zsnes/devel zsnes-1.51-hat_events.patch, NONE, 1.1 zsnes.spec, 1.9, 1.10
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/zsnes/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24447
Modified Files:
zsnes.spec
Added Files:
zsnes-1.51-hat_events.patch
Log Message:
* Sat Nov 26 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.51-11
- fixed gamepad diagonals problem (BZ #1976)
zsnes-1.51-hat_events.patch:
sdllink.c | 8 ++++++++
1 file changed, 8 insertions(+)
--- NEW FILE zsnes-1.51-hat_events.patch ---
diff -durN zsnes_1_51/src/linux/sdllink.c zsnes_1_51.hat_events/src/linux/sdllink.c
--- zsnes_1_51/src/linux/sdllink.c 2007-01-18 17:56:04.000000000 +0100
+++ zsnes_1_51.hat_events/src/linux/sdllink.c 2011-11-26 19:10:00.806907739 +0100
@@ -307,6 +307,8 @@
case SDL_HAT_UP:
pressed[offset + 3] = 1;
pressed[offset + 2] = 0;
+ pressed[offset + 1] = 0;
+ pressed[offset + 0] = 0;
break;
case SDL_HAT_RIGHTUP:
pressed[offset] = 1;
@@ -317,6 +319,8 @@
case SDL_HAT_RIGHT:
pressed[offset] = 1;
pressed[offset + 1] = 0;
+ pressed[offset + 2] = 0;
+ pressed[offset + 3] = 0;
break;
case SDL_HAT_RIGHTDOWN:
pressed[offset] = 1;
@@ -326,6 +330,8 @@
break;
case SDL_HAT_DOWN:
pressed[offset + 2] = 1;
+ pressed[offset + 0] = 0;
+ pressed[offset + 1] = 0;
pressed[offset + 3] = 0;
break;
case SDL_HAT_LEFTDOWN:
@@ -337,6 +343,8 @@
case SDL_HAT_LEFT:
pressed[offset + 1] = 1;
pressed[offset] = 0;
+ pressed[offset + 2] = 0;
+ pressed[offset + 3] = 0;
break;
case SDL_HAT_LEFTUP:
pressed[offset + 1] = 1;
Index: zsnes.spec
===================================================================
RCS file: /cvs/free/rpms/zsnes/devel/zsnes.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- zsnes.spec 18 Sep 2011 17:37:24 -0000 1.9
+++ zsnes.spec 9 Dec 2011 13:02:34 -0000 1.10
@@ -4,7 +4,7 @@
Summary: A Super Nintendo emulator
Name: zsnes
Version: 1.51
-Release: 10%{?dist}
+Release: 11%{?dist}
License: GPLv2
Group: Applications/Emulators
URL: http://www.zsnes.com/
@@ -19,6 +19,10 @@
Patch4: zsnes-1.51-pulseaudio.patch
# Ralf Corsepius
Patch5: zsnes-1.51-psr.patch
+# Fix gamepad diagonals problem
+# http://board.zsnes.com/phpBB3/viewtopic.php?t=12544
+Patch6: zsnes-1.51-hat_events.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# This is to build only for ix86 on plague
#ExclusiveArch: %{ix86}
@@ -50,6 +54,7 @@
%patch3 -p2
%patch4 -p2
%patch5 -p2
+%patch6 -p2
# Remove hardcoded CFLAGS and LDFLAGS
sed -i \
@@ -128,6 +133,9 @@
%doc ../docs/readme.htm/ ../docs/readme.txt/
%changelog
+* Sat Nov 26 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.51-11
+- fixed gamepad diagonals problem (BZ #1976)
+
* Sun Sep 18 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.51-10
- used a patch by Ralf Corsepius to fix issues with parsegen
12 years, 11 months
rpms/devede/F-15 .cvsignore, 1.20, 1.21 devede.spec, 1.26, 1.27 sources, 1.20, 1.21
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/devede/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23692
Modified Files:
.cvsignore devede.spec sources
Log Message:
* Fri Dec 09 2011 Andrea Musuruane <musuruan(a)gmail.com> 3.20.0-1
- Updated to version 3.20.0
- Added missing brasero dependency
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/devede/F-15/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 27 Nov 2011 14:39:53 -0000 1.20
+++ .cvsignore 9 Dec 2011 12:59:04 -0000 1.21
@@ -1 +1 @@
-devede-3.19.0.tar.bz2
+devede-3.20.0.tar.bz2
Index: devede.spec
===================================================================
RCS file: /cvs/free/rpms/devede/F-15/devede.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- devede.spec 27 Nov 2011 14:39:53 -0000 1.26
+++ devede.spec 9 Dec 2011 12:59:04 -0000 1.27
@@ -1,5 +1,5 @@
Name: devede
-Version: 3.19.0
+Version: 3.20.0
Release: 1%{?dist}
Summary: A program to create video DVDs and CDs (VCD, sVCD or CVD)
@@ -23,6 +23,7 @@
Requires: dvdauthor
Requires: vcdimager
Requires: mkisofs
+Requires: brasero
Requires: ImageMagick
Requires: python >= 2.4
Requires: pygtk2 >= 2.16
@@ -115,6 +116,10 @@
%changelog
+* Fri Dec 09 2011 Andrea Musuruane <musuruan(a)gmail.com> 3.20.0-1
+- Updated to version 3.20.0
+- Added missing brasero dependency
+
* Sun Nov 27 2011 Andrea Musuruane <musuruan(a)gmail.com> 3.19.0-1
- Updated to version 3.19.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/devede/F-15/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources 27 Nov 2011 14:39:53 -0000 1.20
+++ sources 9 Dec 2011 12:59:04 -0000 1.21
@@ -1 +1 @@
-bdcf76180ca3babd108debe7f9032d0e devede-3.19.0.tar.bz2
+1f98cab95272277a3b78a8e53664880c devede-3.20.0.tar.bz2
12 years, 11 months
rpms/devede/F-16 .cvsignore, 1.20, 1.21 devede.spec, 1.26, 1.27 sources, 1.20, 1.21
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/devede/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23528
Modified Files:
.cvsignore devede.spec sources
Log Message:
* Fri Dec 09 2011 Andrea Musuruane <musuruan(a)gmail.com> 3.20.0-1
- Updated to version 3.20.0
- Added missing brasero dependency
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/devede/F-16/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 27 Nov 2011 14:39:23 -0000 1.20
+++ .cvsignore 9 Dec 2011 12:58:28 -0000 1.21
@@ -1 +1 @@
-devede-3.19.0.tar.bz2
+devede-3.20.0.tar.bz2
Index: devede.spec
===================================================================
RCS file: /cvs/free/rpms/devede/F-16/devede.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- devede.spec 27 Nov 2011 14:39:24 -0000 1.26
+++ devede.spec 9 Dec 2011 12:58:28 -0000 1.27
@@ -1,5 +1,5 @@
Name: devede
-Version: 3.19.0
+Version: 3.20.0
Release: 1%{?dist}
Summary: A program to create video DVDs and CDs (VCD, sVCD or CVD)
@@ -23,6 +23,7 @@
Requires: dvdauthor
Requires: vcdimager
Requires: mkisofs
+Requires: brasero
Requires: ImageMagick
Requires: python >= 2.4
Requires: pygtk2 >= 2.16
@@ -115,6 +116,10 @@
%changelog
+* Fri Dec 09 2011 Andrea Musuruane <musuruan(a)gmail.com> 3.20.0-1
+- Updated to version 3.20.0
+- Added missing brasero dependency
+
* Sun Nov 27 2011 Andrea Musuruane <musuruan(a)gmail.com> 3.19.0-1
- Updated to version 3.19.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/devede/F-16/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources 27 Nov 2011 14:39:24 -0000 1.20
+++ sources 9 Dec 2011 12:58:28 -0000 1.21
@@ -1 +1 @@
-bdcf76180ca3babd108debe7f9032d0e devede-3.19.0.tar.bz2
+1f98cab95272277a3b78a8e53664880c devede-3.20.0.tar.bz2
12 years, 11 months
rpms/devede/devel .cvsignore, 1.20, 1.21 devede.spec, 1.26, 1.27 sources, 1.20, 1.21
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/devede/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22673
Modified Files:
.cvsignore devede.spec sources
Log Message:
* Fri Dec 09 2011 Andrea Musuruane <musuruan(a)gmail.com> 3.20.0-1
- Updated to version 3.20.0
- Added missing brasero dependency
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/devede/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 27 Nov 2011 14:38:46 -0000 1.20
+++ .cvsignore 9 Dec 2011 12:51:43 -0000 1.21
@@ -1 +1 @@
-devede-3.19.0.tar.bz2
+devede-3.20.0.tar.bz2
Index: devede.spec
===================================================================
RCS file: /cvs/free/rpms/devede/devel/devede.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- devede.spec 27 Nov 2011 14:38:46 -0000 1.26
+++ devede.spec 9 Dec 2011 12:51:44 -0000 1.27
@@ -1,5 +1,5 @@
Name: devede
-Version: 3.19.0
+Version: 3.20.0
Release: 1%{?dist}
Summary: A program to create video DVDs and CDs (VCD, sVCD or CVD)
@@ -23,6 +23,7 @@
Requires: dvdauthor
Requires: vcdimager
Requires: mkisofs
+Requires: brasero
Requires: ImageMagick
Requires: python >= 2.4
Requires: pygtk2 >= 2.16
@@ -115,6 +116,10 @@
%changelog
+* Fri Dec 09 2011 Andrea Musuruane <musuruan(a)gmail.com> 3.20.0-1
+- Updated to version 3.20.0
+- Added missing brasero dependency
+
* Sun Nov 27 2011 Andrea Musuruane <musuruan(a)gmail.com> 3.19.0-1
- Updated to version 3.19.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/devede/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources 27 Nov 2011 14:38:46 -0000 1.20
+++ sources 9 Dec 2011 12:51:44 -0000 1.21
@@ -1 +1 @@
-bdcf76180ca3babd108debe7f9032d0e devede-3.19.0.tar.bz2
+1f98cab95272277a3b78a8e53664880c devede-3.20.0.tar.bz2
12 years, 11 months
rpms/nvidia-96xx-kmod/F-14 nvidia-96xx-kmod.spec,1.50,1.51
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-96xx-kmod/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5886
Modified Files:
nvidia-96xx-kmod.spec
Log Message:
Rebuilt for updated kernel
Index: nvidia-96xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-96xx-kmod/F-14/nvidia-96xx-kmod.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- nvidia-96xx-kmod.spec 24 Nov 2011 08:44:10 -0000 1.50
+++ nvidia-96xx-kmod.spec 8 Dec 2011 13:24:07 -0000 1.51
@@ -7,7 +7,7 @@
Name: nvidia-96xx-kmod
Version: 96.43.19
-Release: 1%{?dist}.17
+Release: 1%{?dist}.18
# Taken over by kmodtool
Summary: NVIDIA 96xx display driver kernel module
Group: System Environment/Kernel
@@ -91,6 +91,9 @@
%changelog
+* Thu Dec 08 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.19-1.18
+- Rebuilt for updated kernel
+
* Thu Nov 24 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.19-1.17
- rebuild for updated kernel
12 years, 11 months
rpms/vlc/devel vlc.spec,1.136,1.137
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2674
Modified Files:
vlc.spec
Log Message:
Fix Build conditional
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- vlc.spec 7 Dec 2011 21:00:18 -0000 1.136
+++ vlc.spec 7 Dec 2011 21:43:16 -0000 1.137
@@ -270,7 +270,7 @@
%{?_with_faad2:--enable-faad} \
%{!?_with_libmad:--disable-mad} \
%{?_with_twolame:--enable-twolame} \
-%{?_with_freeworld:--enable-real --enable-realrtsp} \
+%{?!_without_freeworld:--enable-real --enable-realrtsp} \
--enable-flac \
--enable-tremor \
--enable-speex \
12 years, 11 months
rpms/vlc/devel .cvsignore, 1.41, 1.42 sources, 1.49, 1.50 vlc.spec, 1.135, 1.136 0001-Fix-typo-in-vlc.desktop.patch, 1.1, NONE 0001-kate-do-not-access-the-renderer-if-it-fails-to-initi.patch, 1.1, NONE vlc-1.1.0-vlc-cache-gen_noerror.patch, 1.1, NONE vlc-1.1.4-tls_path.patch, 1.1, NONE vlc-1.1.6-hardode_font_patch.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27778/devel
Modified Files:
.cvsignore sources vlc.spec
Removed Files:
0001-Fix-typo-in-vlc.desktop.patch
0001-kate-do-not-access-the-renderer-if-it-fails-to-initi.patch
vlc-1.1.0-vlc-cache-gen_noerror.patch vlc-1.1.4-tls_path.patch
vlc-1.1.6-hardode_font_patch.patch
Log Message:
- Update to 1.2.0-pre2
- Reverse build conditional to --without freeworld
So it can be tested with Fedora only (patches welcomed)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore 7 Oct 2011 08:27:35 -0000 1.41
+++ .cvsignore 7 Dec 2011 21:00:17 -0000 1.42
@@ -1 +1 @@
-vlc-1.1.12.tar.bz2
+vlc-1.2.0-pre2.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources 7 Oct 2011 08:27:35 -0000 1.49
+++ sources 7 Dec 2011 21:00:18 -0000 1.50
@@ -1 +1 @@
-91de1ad308c947e35380f9d747ff5713 vlc-1.1.12.tar.bz2
+13bf48d8e20bc9a04e53733861a249bc vlc-1.2.0-pre2.tar.xz
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- vlc.spec 7 Dec 2011 20:18:05 -0000 1.135
+++ vlc.spec 7 Dec 2011 21:00:18 -0000 1.136
@@ -1,10 +1,8 @@
#global live555_date 2009.07.28
-#global vlc_rc -rc3
-%global vlc_bootstrap 1
-%global tarball_version 1.1.12
+%global vlc_rc -pre2
+#global _with_bootstrap 1
%global _with_workaround_circle_deps 1
-%global _with_freeworld 1
-%if 0%{?_with_freeworld:1}
+%if 0%{?!_without_freeworld:1}
%global _with_a52dec --with-a52dec
%global _with_faad2 --with-faad2
%global _with_ffmpeg --with-ffmpeg
@@ -18,39 +16,32 @@
%global _with_xvidcore --with-xvidcore
%global _with_live555 --with-live555
%global _with_vaapi --with-vaapi
+%global _without_opencv 1
%endif
-%if 0%{?fedora} < 15
-%global _with_gnomevfs 1
-%endif
-%global _without_mozilla 1
+
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
-Version: 1.1.12
-Release: 4%{?dist}
+Version: 1.2.0
+Release: 0.2_pre2%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
-Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{...
+Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{...
%if 0%{?live555_date:1}
Source2: http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz
%endif
-Patch0: vlc-1.1.0-vlc-cache-gen_noerror.patch
-Patch3: vlc-1.1.6-hardode_font_patch.patch
-Patch4: vlc-1.1.4-tls_path.patch
Patch5: vlc-1.1.8-bugfix.opencv22.patch
-Patch6: 0001-Fix-typo-in-vlc.desktop.patch
-Patch7: 0001-kate-do-not-access-the-renderer-if-it-fails-to-initi.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: prelink
-%if 0%{?vlc_bootstrap:1}
+%{?_with_bootstrap:
BuildRequires: gettext-devel
BuildRequires: libtool
-%endif
+}
%{?_with_a52dec:BuildRequires: a52dec-devel}
BuildRequires: aalib-devel
@@ -72,9 +63,11 @@
BuildRequires: kde-filesystem
BuildRequires: libavc1394-devel
BuildRequires: libass-devel >= 0.9.7
+BuildRequires: libbluray-devel
BuildRequires: libcaca-devel
BuildRequires: libcddb-devel
BuildRequires: libcdio-devel >= 0.77-3
+BuildRequires: libcrystalhd-devel
BuildRequires: libdc1394-devel >= 2.1.0
%{?_with_libdca:BuildRequires: libdca-devel}
BuildRequires: libdv-devel
@@ -89,9 +82,6 @@
BuildRequires: libmp4v2-devel
BuildRequires: libmpcdec-devel
BuildRequires: libmtp-devel >= 1.0.0
-%if 0%{?fedora} < 15
-BuildRequires: libnotify-devel
-%endif
BuildRequires: libprojectM-qt-devel
BuildRequires: libproxy-devel
BuildRequires: librsvg2-devel >= 2.9.0
@@ -116,6 +106,7 @@
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
BuildRequires: libmusicbrainz-devel
+BuildRequires: libsamplerate-devel
BuildRequires: libshout-devel
BuildRequires: lua-devel
BuildRequires: minizip-devel
@@ -128,16 +119,13 @@
BuildRequires: portaudio-devel
BuildRequires: qt4-devel >= 4.5.2
BuildRequires: schroedinger-devel
+BuildRequires: sqlite-devel
BuildRequires: SDL_image-devel
BuildRequires: speex-devel >= 1.1.5
-%ifarch %{ix86} x86_64
-BuildRequires: svgalib-devel
-%endif
BuildRequires: taglib-devel
%{?_with_twolame:BuildRequires: twolame-devel}
%{?_with_vcdimager:BuildRequires: vcdimager-devel >= 0.7.21}
%{?_with_x264:BuildRequires: x264-devel >= 0-0.8.20061028}
-%{?_with_xosd:BuildRequires: xosd-devel}
%{?_with_xvidcore:BuildRequires: xvidcore-devel}
BuildRequires: zlib-devel
BuildRequires: zvbi-devel
@@ -150,12 +138,9 @@
BuildRequires: libXext-devel
BuildRequires: libXpm-devel
BuildRequires: xcb-util-devel
-BuildRequires: pkgconfig(xcb-keysyms)
BuildRequires: xorg-x11-proto-devel
-%{!?_without_mozilla:BuildRequires: gecko-devel nspr-devel}
-%{?_without_mozilla:Obsoletes: mozilla-vlc < %{version}-%{release}}
%{?_with_workaround_circle_deps:BuildRequires: phonon-backend-gstreamer}
@@ -195,24 +180,12 @@
developing applications that use %{name}.
-%{!?_without_mozilla:
-%package -n mozilla-vlc
-Summary: VLC media player plugin for Mozilla compatible web browsers
-Group: Applications/Multimedia
-Requires: %{name}-xorg%{_isa} = %{version}-%{release}
-Requires: %{_libdir}/mozilla/plugins
-
-%description -n mozilla-vlc
-This package contains a VLC media player plugging for Mozilla compatible
-web browsers.
-
-}
-
%package core
Summary: VLC media player core
Group: Applications/Multimedia
Provides: vlc-nox = %{version}-%{release}
Obsoletes: vlc-nox < 1.1.5-2
+Obsoletes: mozilla-vlc < 1.2.0
%{?live555date:Requires: live555date%{_isa} = %{live555date}}
%description core
@@ -237,26 +210,18 @@
%prep
-%setup -q -n %{name}-%{tarball_version}%{?vlc_rc}
+%setup -q -n %{name}-%{version}%{?vlc_rc}
%if 0%{?live555_date:1}
%setup -q -D -T -a 2 -n %{name}-%{version}%{?vlc_rc}
%endif
-%patch0 -p1 -b .noerror
-%patch3 -p1 -b .hardode_path
-%patch4 -p1 -b .tls_path
%if 0%{?fedora} >= 15
%patch5 -p1 -b .opencv22
%endif
-sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
-%patch6 -p1
-%patch7 -p1
-
-rm modules/access/videodev2.h
-ln -sf %{_includedir}/linux/videodev2.h modules/access/videodev2.h
-%if 0%{?vlc_bootstrap:1}
+
+%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
./bootstrap
-%endif
+}
@@ -292,7 +257,7 @@
%{!?_without_opencv:--enable-opencv} \
--enable-sftp \
--enable-pvr \
-%{?_with_gnomevfs:--enable-gnomevfs} \
+%{?_with_gnomevfs:--enable-gnomevfs} \
%{?_with_vcdimager:--enable-vcdx} \
%if 0
%{?_with_freeworld:--enable-wma-fixed} \
@@ -315,10 +280,6 @@
--enable-shout \
--enable-xcb \
--enable-svg \
- --enable-snapshot \
-%ifarch %{ix86} x86_64
- --enable-svgalib \
-%endif
%{!?_without_directfb:--enable-directfb} \
--enable-aa \
--enable-caca \
@@ -326,7 +287,6 @@
--enable-portaudio \
--enable-pulse \
--enable-ncurses \
-%{?_with_xosd:--enable-xosd} \
--enable-fbosd \
--enable-lirc \
%ifarch %{ix86}
@@ -334,10 +294,9 @@
%else
--without-contrib \
%endif
-%{!?_without_mozilla:--enable-mozilla} \
-%if 1
+%if 0
# remove rpath from libtool
sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -366,13 +325,6 @@
--mode 644 \
$RPM_BUILD_ROOT%{_datadir}/applications/vlc.desktop
-# Remove installed fonts for skin2
-rm -rf $RPM_BUILD_ROOT%{_datadir}/vlc/skin2/fonts/*.ttf
-ln -sf ../../../fonts/dejavu/DejaVuSans.ttf \
- $RPM_BUILD_ROOT%{_datadir}/vlc/skins2/fonts/FreeSans.ttf
-ln -sf ../../../fonts/dejavu/DejaVuSans-Bold.ttf \
- $RPM_BUILD_ROOT%{_datadir}/vlc/skins2/fonts/FreeSansBold.ttf
-
#Clear execstak
%ifarch %{ix86}
execstack -c $RPM_BUILD_ROOT%{_libdir}/vlc/plugins/codec/libdmo_plugin.so
@@ -433,7 +385,7 @@
%preun core
if [ $1 == 0 ] ; then
- rm -rf %{_libdir}/vlc/plugins-*-*.dat
+ rm -f %{_libdir}/vlc/plugins*.dat
fi || :
@@ -444,7 +396,6 @@
%{_datadir}/kde4/apps/solid/actions/vlc-*.desktop
%{_datadir}/icons/hicolor/*/apps/vlc*.png
%{_datadir}/icons/hicolor/*/apps/vlc*.xpm
-%{_datadir}/vlc/skins2/
%{_bindir}/qvlc
%{_bindir}/svlc
%{_libdir}/vlc/plugins/gui/libqt4_plugin.so
@@ -453,18 +404,13 @@
}
%{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
%{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so
-%{_libdir}/vlc/plugins/misc/libsvg_plugin.so
%{_libdir}/vlc/plugins/video_output/libaa_plugin.so
%{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so
-%{?_with_xosd:%{_libdir}/vlc/plugins/misc/libxosd_plugin.so}
-%{_libdir}/vlc/plugins/gui/libskins2_plugin.so
-%if 0%{?fedora} > 11 || 0%{?rhel} > 5
%{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so
-%endif
%{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so
%{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so
@@ -475,7 +421,6 @@
%{_bindir}/nvlc
%{_bindir}/rvlc
%{_bindir}/vlc-wrapper
-%exclude %{_datadir}/vlc/skins2
%{_datadir}/vlc/
%{_libdir}/*.so.*
%exclude %{_libdir}/vlc/plugins/gui/libqt4_plugin.so
@@ -486,31 +431,20 @@
%exclude %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
%exclude %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
%exclude %{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so
-%exclude %{_libdir}/vlc/plugins/misc/libsvg_plugin.so
-%if 0%{?fedora} < 15
-%exclude %{_libdir}/vlc/plugins/misc/libnotify_plugin.so
-%endif
%exclude %{_libdir}/vlc/plugins/video_output/libaa_plugin.so
%exclude %{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
%exclude %{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so
%exclude %{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so
%exclude %{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so
%exclude %{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so
-%{?_with_xosd:%exclude %{_libdir}/vlc/plugins/misc/libxosd_plugin.so}
-%ifarch %{ix86} x86_64
-%exclude %{_libdir}/vlc/plugins/video_output/libsvgalib_plugin.so
-%endif
%{!?_without_directfb:
%exclude %{_libdir}/vlc/plugins/video_output/libdirectfb_plugin.so
}
-%exclude %{_libdir}/vlc/plugins/gui/libskins2_plugin.so
%{!?_without_opencv:
%exclude %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
%exclude %{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
}
-%if 0%{?fedora} > 11 || 0%{?rhel} > 5
%exclude %{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so
-%endif
%exclude %{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so
%exclude %{_libdir}/vlc/plugins/audio_output/libjack_plugin.so
%exclude %{_libdir}/vlc/plugins/audio_output/libportaudio_plugin.so
@@ -530,44 +464,26 @@
%{!?_without_directfb:
%{_libdir}/vlc/plugins/video_output/libdirectfb_plugin.so
}
-%if 0%{?fedora} < 15
-%{_libdir}/vlc/plugins/misc/libnotify_plugin.so
-%endif
%{!?_without_opencv:
%{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
%{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
}
-%ifarch %{ix86} x86_64
-%{_libdir}/vlc/plugins/video_output/libsvgalib_plugin.so
-%endif
%files devel
%defattr(-,root,root,-)
-%doc HACKING
%dir %{_includedir}/vlc
%{_includedir}/vlc/*
-%{_mandir}/man1/vlc-config.1*
%{_libdir}/*.so
%{_libdir}/pkgconfig/vlc-plugin.pc
%{_libdir}/pkgconfig/libvlc.pc
-%{!?_without_mozilla:
-%files -n mozilla-vlc
-%defattr(-,root,root,-)
-%{_libdir}/mozilla/plugins/libvlcplugin.so
-}
-
%changelog
-* Wed Dec 07 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.12-4
-- Rebuilt for xcb
-
-* Wed Nov 23 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.12-3
-- Disable mozilla-vlc for F-17
-
-* Wed Nov 23 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.12-2
-- Rebuilf for libcdio/libmatroska
+* Wed Dec 07 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.2.0-0.2_pre2
+- Update to 1.2.0-pre2
+- Reverse build conditional to --without freeworld
+ So it can be tested with Fedora only (patches welcomed)
* Fri Oct 07 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.12-1
- Update to 1.1.12
--- 0001-Fix-typo-in-vlc.desktop.patch DELETED ---
--- 0001-kate-do-not-access-the-renderer-if-it-fails-to-initi.patch DELETED ---
--- vlc-1.1.0-vlc-cache-gen_noerror.patch DELETED ---
--- vlc-1.1.4-tls_path.patch DELETED ---
--- vlc-1.1.6-hardode_font_patch.patch DELETED ---
12 years, 11 months
rpms/vlc/devel vlc.spec,1.134,1.135
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19401
Modified Files:
vlc.spec
Log Message:
Add BR
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- vlc.spec 7 Dec 2011 19:19:45 -0000 1.134
+++ vlc.spec 7 Dec 2011 20:18:05 -0000 1.135
@@ -150,6 +150,7 @@
BuildRequires: libXext-devel
BuildRequires: libXpm-devel
BuildRequires: xcb-util-devel
+BuildRequires: pkgconfig(xcb-keysyms)
BuildRequires: xorg-x11-proto-devel
12 years, 11 months
rpms/vlc/devel vlc.spec,1.133,1.134
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11086
Modified Files:
vlc.spec
Log Message:
Rebuilt
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- vlc.spec 23 Nov 2011 19:55:18 -0000 1.133
+++ vlc.spec 7 Dec 2011 19:19:45 -0000 1.134
@@ -27,7 +27,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 1.1.12
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -559,6 +559,9 @@
%changelog
+* Wed Dec 07 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.12-4
+- Rebuilt for xcb
+
* Wed Nov 23 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.12-3
- Disable mozilla-vlc for F-17
12 years, 11 months