1 |
ssuominen 10/04/29 11:24:21 |
2 |
|
3 |
Modified: series |
4 |
Added: 180_all_bof.patch |
5 |
190_all_glx-define-prototype.patch |
6 |
200_all_libpng14.patch |
7 |
Log: |
8 |
Update patchset to level 3. |
9 |
|
10 |
Revision Changes Path |
11 |
1.2 src/patchsets/gpac/0.4.5/series |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/series?rev=1.2&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/series?rev=1.2&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/series?r1=1.1&r2=1.2 |
16 |
|
17 |
Index: series |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo/src/patchsets/gpac/0.4.5/series,v |
20 |
retrieving revision 1.1 |
21 |
retrieving revision 1.2 |
22 |
diff -u -r1.1 -r1.2 |
23 |
--- series 31 Jan 2009 15:08:13 -0000 1.1 |
24 |
+++ series 29 Apr 2010 11:24:21 -0000 1.2 |
25 |
@@ -7,3 +7,6 @@ |
26 |
150_all_ffmpeglink.patch |
27 |
160_all_externalamr.patch |
28 |
170_all_xlink.patch |
29 |
+180_all_bof.patch |
30 |
+190_all_glx-define-prototype.patch |
31 |
+200_all_libpng14.patch |
32 |
|
33 |
|
34 |
|
35 |
1.1 src/patchsets/gpac/0.4.5/180_all_bof.patch |
36 |
|
37 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/180_all_bof.patch?rev=1.1&view=markup |
38 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/180_all_bof.patch?rev=1.1&content-type=text/plain |
39 |
|
40 |
Index: 180_all_bof.patch |
41 |
=================================================================== |
42 |
http://bugs.gentoo.org/show_bug.cgi?id=259389 |
43 |
|
44 |
--- gpac/src/isomedia/box_code_base.c |
45 |
+++ gpac/src/isomedia/box_code_base.c |
46 |
@@ -109,7 +109,7 @@ |
47 |
|
48 |
tmp = (GF_ChapterListBox *) malloc(sizeof(GF_ChapterListBox)); |
49 |
if (tmp == NULL) return NULL; |
50 |
- memset(tmp, 0, sizeof(GF_CopyrightBox)); |
51 |
+ memset(tmp, 0, sizeof(GF_ChapterListBox)); |
52 |
tmp->list = gf_list_new(); |
53 |
gf_isom_full_box_init((GF_Box *)tmp); |
54 |
tmp->type = GF_ISOM_BOX_TYPE_CHPL; |
55 |
|
56 |
|
57 |
|
58 |
1.1 src/patchsets/gpac/0.4.5/190_all_glx-define-prototype.patch |
59 |
|
60 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/190_all_glx-define-prototype.patch?rev=1.1&view=markup |
61 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/190_all_glx-define-prototype.patch?rev=1.1&content-type=text/plain |
62 |
|
63 |
Index: 190_all_glx-define-prototype.patch |
64 |
=================================================================== |
65 |
Index: work/gpac/src/compositor/visual_manager_3d_gl.c |
66 |
=================================================================== |
67 |
--- work.orig/gpac/src/compositor/visual_manager_3d_gl.c |
68 |
+++ work/gpac/src/compositor/visual_manager_3d_gl.c |
69 |
@@ -70,6 +70,7 @@ void gf_sc_load_opengl_extensions(GF_Com |
70 |
#elif defined (WIN32) |
71 |
#define GET_GLFUN(__name) (PFNGLARBMULTITEXTUREPROC) wglGetProcAddress(__name) |
72 |
#else |
73 |
+extern void (*glXGetProcAddress(const GLubyte *procname))( void ); |
74 |
#define GET_GLFUN(__name) (PFNGLARBMULTITEXTUREPROC) glXGetProcAddress(__name) |
75 |
#endif |
76 |
|
77 |
|
78 |
|
79 |
|
80 |
1.1 src/patchsets/gpac/0.4.5/200_all_libpng14.patch |
81 |
|
82 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/200_all_libpng14.patch?rev=1.1&view=markup |
83 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/200_all_libpng14.patch?rev=1.1&content-type=text/plain |
84 |
|
85 |
Index: 200_all_libpng14.patch |
86 |
=================================================================== |
87 |
http://repos.archlinux.org/wsvn/community/gpac/trunk/libpng14-infopp-null.patch |
88 |
|
89 |
--- src/media_tools/img.c |
90 |
+++ src/media_tools/img.c |
91 |
@@ -551,7 +551,7 @@ GF_Err gf_img_png_enc(char *data, u32 wi |
92 |
/* Allocate/initialize the image information data. REQUIRED */ |
93 |
info_ptr = png_create_info_struct(png_ptr); |
94 |
if (info_ptr == NULL) { |
95 |
- png_destroy_write_struct(&png_ptr, png_infopp_NULL); |
96 |
+ png_destroy_write_struct(&png_ptr, NULL); |
97 |
return GF_IO_ERR; |
98 |
} |