Author: qboosh Date: Sun Sep 18 12:20:03 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 1.3.7
- removed obsolete flock patch
- updated Werror patch
---- Files affected:
packages/libshjpeg:
libshjpeg-Werror.patch (1.1 -> 1.2) , libshjpeg.spec (1.2 -> 1.3) ,
libshjpeg-flock.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/libshjpeg/libshjpeg-Werror.patch
diff -u packages/libshjpeg/libshjpeg-Werror.patch:1.1
packages/libshjpeg/libshjpeg-Werror.patch:1.2
--- packages/libshjpeg/libshjpeg-Werror.patch:1.1 Tue Jul 12 21:16:49 2011
+++ packages/libshjpeg/libshjpeg-Werror.patch Sun Sep 18 14:19:58 2011
@@ -1,6 +1,6 @@
---- dhobsong-libshjpeg-79973e7/tests/shjpegtest.c.orig 2011-07-04
06:54:23.000000000 +0200
-+++ dhobsong-libshjpeg-79973e7/tests/shjpegtest.c 2011-07-12
20:22:04.895498917 +0200
-@@ -88,7 +88,7 @@
+--- dhobsong-libshjpeg-711cc9b/tests/shjpegtest.c.orig 2011-08-29
07:40:20.000000000 +0200
++++ dhobsong-libshjpeg-711cc9b/tests/shjpegtest.c 2011-09-18
14:04:11.637668119 +0200
+@@ -88,7 +88,7 @@ void write_bmp(const char *filename, int
unsigned long phys, int pitch, int width, int height)
{
bmp_header_t bmp_header;
@@ -9,12 +9,125 @@
void *mem, *ptr;
FILE *file;
char *buffer = NULL, tmp;
-@@ -149,8 +149,6 @@
+@@ -152,10 +152,8 @@ void write_bmp(const char *filename, int
+
+ /* Write BMP header */
fprintf(file, "BM");
- fwrite(&bmp_header, 1, sizeof(bmp_header), file);
+- fwrite(&bmp_header, 1, sizeof(bmp_header), file);
++ int status = fwrite(&bmp_header, 1, sizeof(bmp_header), file);
(void)status;
- /* Write data */
- bw = bpp >> 3;
// mem += (height - 1) * pitch;
ptr = mem;
for (h = 0; h < height; h++) {
+@@ -173,7 +171,7 @@ void write_bmp(const char *filename, int
+ }
+ break;
+ }
+- fwrite(buffer, 1, stride, file);
++ int status = fwrite(buffer, 1, stride, file); (void)status;
+ ptr += pitch;
+ }
+
+@@ -218,7 +216,7 @@ write_ppm(const char *filename,
+
+ /* Write data */
+ for (i=0; i<height; i++) {
+- fwrite(mem, 3, width, file);
++ int status = fwrite(mem, 3, width, file); (void)status;
+ mem += pitch;
+ }
+
+--- dhobsong-libshjpeg-711cc9b/tests/v2mjpeg.c.orig 2011-09-18
14:05:15.601003592 +0200
++++ dhobsong-libshjpeg-711cc9b/tests/v2mjpeg.c 2011-09-18 14:04:45.794335930
+0200
+@@ -425,13 +425,13 @@ int main(int argc, char *argv[])
+ fprintf(stderr, "Can't create file: %s\n", fn);
+ return 1;
+ }
+- fwrite(data.data, data.offset, 1, fp);
++ int status = fwrite(data.data, data.offset, 1, fp); (void)status;
+ fclose(fp);
+ } else {
+ printf("\r\n\r\n--%s\r\n", MJPEG_BOUNDARY);
+ printf("Content-Type: image/jpeg\r\n");
+ printf("Content-length: %d\r\n\r\n", data.offset);
+- fwrite(data.data, data.offset, 1, stdout);
++ int status = fwrite(data.data, data.offset, 1, stdout);
(void)status;
+ // printf("\r\n");
+ }
+
+--- dhobsong-libshjpeg-711cc9b/tests/libjpeg_test.c.orig 2011-08-29
07:40:20.000000000 +0200
++++ dhobsong-libshjpeg-711cc9b/tests/libjpeg_test.c 2011-09-18
14:05:46.681004634 +0200
+@@ -125,7 +125,7 @@ dump_ppm(char *file, unsigned char *buff
+ if (mode == JCS_RGB) {
+ fprintf(dumpfile, "P6 %d %d %d\n", width, height, 255);
+ }
+- fwrite(buffer, 1, width*height*3, dumpfile);
++ int status = fwrite(buffer, 1, width*height*3, dumpfile); (void)status;
+ fclose(dumpfile);
+ }
+
+@@ -174,7 +174,7 @@ compress_jpeg_file(char *output, unsigne
+ jpeg_destroy_compress(&cinfo);
+ #if JPEG_LIB_VERSION >= 80
+ if (!stdio_src) {
+- fwrite(membuf, 1, buflen, outfile);
++ int status = fwrite(membuf, 1, buflen, outfile); (void)status;
+ }
+ #endif
+ fclose(outfile);
+--- dhobsong-libshjpeg-711cc9b/tests/shjpeg_multithread.c.orig 2011-08-29
07:40:20.000000000 +0200
++++ dhobsong-libshjpeg-711cc9b/tests/shjpeg_multithread.c 2011-09-18
14:07:28.747674719 +0200
+@@ -116,7 +116,7 @@ void write_framebuffer(void *fb_buffer,
+
+ copy_height = height > fb_vinfo.yres ? fb_vinfo.yres : height;
+ copy_width = width > (fb_vinfo.xres / 2) ? (fb_vinfo.xres / 2): width;
+- for (i = 0; i < height; i++) {
++ for (i = 0; i < copy_height; i++) {
+ memcpy(fb_buffer, data_buf, copy_width *
+ fb_vinfo.bits_per_pixel / 8);
+ fb_buffer += fb_info.line_length;
+@@ -295,7 +295,7 @@ main(int argc, char *argv[])
+ return 1;
+ }
+ }
+-
++ (void)quiet;
+
+ if (optind > argc) {
+ print_usage();
+--- dhobsong-libshjpeg-711cc9b/tests/Makefile.am.orig 2011-08-29
07:40:20.000000000 +0200
++++ dhobsong-libshjpeg-711cc9b/tests/Makefile.am 2011-09-18
14:10:25.537680638 +0200
+@@ -27,8 +27,8 @@ libjpegtest_SOURCES = libjpeg_test.c
+ libjpegtest_LDADD = ../src/libshjpeg.la $(UIOMUX_LIBS) $(SHVEU_LIBS)
+
+ shjpeg_multithread_SOURCES = shjpeg_multithread.c
+-shjpeg_multithread_LDADD = ../src/libshjpeg.la $(UIOMUX_LIBS) $(SHVEU_LIBS)
++shjpeg_multithread_LDADD = ../src/libshjpeg.la $(UIOMUX_LIBS) $(SHVEU_LIBS)
-lpthread
+ shjpeg_multithread_CFLAGS = $(AM_CFLAGS) $(UIOMUX_CFLAGS)
+
+ libjpeg_multithread_SOURCES = libjpeg_thread.c
+-libjpeg_multithread_LDADD = ../src/libshjpeg.la $(UIOMUX_LIBS) $(SHVEU_LIBS)
++libjpeg_multithread_LDADD = ../src/libshjpeg.la $(UIOMUX_LIBS) $(SHVEU_LIBS)
-lpthread
+--- dhobsong-libshjpeg-711cc9b/tests/libjpeg_thread.c.orig 2011-08-29
07:40:20.000000000 +0200
++++ dhobsong-libshjpeg-711cc9b/tests/libjpeg_thread.c 2011-09-18
14:10:15.597680304 +0200
+@@ -162,7 +162,7 @@ compress_jpeg_file(char *output, unsigne
+ jpeg_destroy_compress(&cinfo);
+ #if JPEG_LIB_VERSION >= 80
+ if (!stdio_src) {
+- fwrite(membuf, 1, buflen, outfile);
++ int status = fwrite(membuf, 1, buflen, outfile); (void)status;
+ }
+ #endif
+ fclose(outfile);
+@@ -310,7 +310,8 @@ main(int argc, char *argv[])
+ return 1;
+ }
+ }
+-
++ (void)dump;
++ (void)dumpfn;
+
+ if (optind != (argc - 2)) {
+ printf("optind %d argc %d\n", optind, argc);
================================================================
Index: packages/libshjpeg/libshjpeg.spec
diff -u packages/libshjpeg/libshjpeg.spec:1.2
packages/libshjpeg/libshjpeg.spec:1.3
--- packages/libshjpeg/libshjpeg.spec:1.2 Tue Jul 12 21:16:49 2011
+++ packages/libshjpeg/libshjpeg.spec Sun Sep 18 14:19:58 2011
@@ -2,26 +2,28 @@
Summary: Hardware-accelerated JPEG encoder/decoder library for SH Mobile
Summary(pl.UTF-8): Biblioteka sprzętowo wspomaganego kodera/dekodera JPEG
dla SH Mobile
Name: libshjpeg
-Version: 1.3.6
-%define gitver 79973e7
+Version: 1.3.7
+%define gitver 711cc9b
Release: 1
License: LGPL v2+
Group: Libraries
# trailing /%{name}-%{version}.tar.gz is a hack for df
Source0:
https://github.com/dhobsong/libshjpeg/tarball/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 9f4fe9f81394c55beda06818c56082ee
+# Source0-md5: 6ce4f05907b41d06981bc10ca3b87383
Patch0: %{name}-pc.patch
-Patch1: %{name}-flock.patch
-Patch2: %{name}-Werror.patch
+Patch1: %{name}-Werror.patch
URL: http://github.com/dhobsong/libshjpeg
BuildRequires: autoconf >= 2.63
BuildRequires: automake
BuildRequires: doxygen
+BuildRequires: libjpeg-devel
BuildRequires: libtool
-BuildRequires: libuiomux-devel >= 1.5.0
+BuildRequires: libshveu-devel >= 1.7.0
+BuildRequires: libuiomux-devel >= 1.6.0
BuildRequires: ncurses-devel
BuildRequires: pkgconfig
-Requires: libuiomux >= 1.5.0
+Requires: libshveu >= 1.7.0
+Requires: libuiomux >= 1.6.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -35,7 +37,8 @@
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libshjpeg
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: libuiomux-devel >= 1.5.0
+Requires: libshveu-devel >= 1.7.0
+Requires: libuiomux-devel >= 1.6.0
%description devel
Header files for libshjpeg library.
@@ -70,7 +73,6 @@
%setup -q -n dhobsong-%{name}-%{gitver}
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%build
%{__libtoolize}
@@ -90,8 +92,8 @@
# obsoleted by pkgconfig (with pc patch)
%{__rm} $RPM_BUILD_ROOT%{_libdir}/libshjpeg.la
# tests not packaged
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/{libjpegtest,shjpegtest,shjpegshow} \
- $RPM_BUILD_ROOT%{_mandir}/man1/{libjpegtest,shjpegtest,shjpegshow}.1
+%{__rm}
$RPM_BUILD_ROOT%{_bindir}/{libjpegtest,libjpeg_multithread,shjpegtest,shjpegshow,shjpeg_multithread}
\
+
$RPM_BUILD_ROOT%{_mandir}/man1/{libjpegtest,libjpeg_multithread,shjpegtest,shjpegshow,shjpeg_multithread}.1
# HTML packaged in -apidocs
%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/libshjpeg
@@ -129,6 +131,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.3 2011/09/18 12:19:58 qboosh
+- updated to 1.3.7
+- removed obsolete flock patch
+- updated Werror patch
+
Revision 1.2 2011/07/12 19:16:49 qboosh
- updated to 1.3.6
- added flock,Werror patches
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libshjpeg/libshjpeg-Werror.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libshjpeg/libshjpeg.spec?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
