+++ /dev/null
-Index: gpac/src/media_tools/img.c
-===================================================================
---- gpac.orig/src/media_tools/img.c
-+++ gpac/src/media_tools/img.c
-@@ -388,7 +388,7 @@ typedef struct
-
- static void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
- {
-- GFpng *ctx = (GFpng*)png_ptr->io_ptr;
-+ GFpng *ctx = (GFpng*)png_get_io_ptr(png_ptr);
-
- if (ctx->pos + length > ctx->size) {
- png_error(png_ptr, "Read Error");
-@@ -399,7 +399,7 @@ static void user_read_data(png_structp p
- }
- static void user_error_fn(png_structp png_ptr,png_const_charp error_msg)
- {
-- longjmp(png_ptr->jmpbuf, 1);
-+ longjmp(png_jmpbuf(png_ptr), 1);
- }
-
- GF_EXPORT
-@@ -409,7 +409,11 @@ GF_Err gf_img_png_dec(char *png, u32 png
- png_struct *png_ptr;
- png_info *info_ptr;
- png_byte **rows;
-- u32 i, stride, bpp;
-+ u32 i, stride;
-+ int num_trans;
-+ png_bytep trans_alpha;
-+ png_color_16p trans_color;
-+ int bit_depth, color_type;
-
- if ((png_size<8) || png_sig_cmp(png, 0, 8) ) return GF_NON_COMPLIANT_BITSTREAM;
-
-@@ -424,7 +428,7 @@ GF_Err gf_img_png_dec(char *png, u32 png
- png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
- return GF_IO_ERR;
- }
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png_ptr))) {
- png_destroy_info_struct(png_ptr,(png_infopp) & info_ptr);
- png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
- return GF_IO_ERR;
-@@ -434,31 +438,31 @@ GF_Err gf_img_png_dec(char *png, u32 png
-
- png_read_info(png_ptr, info_ptr);
-
-+ png_get_IHDR(png_ptr,info_ptr,width,height,&bit_depth,&color_type,NULL,NULL,NULL);
- /*unpaletize*/
-- if (info_ptr->color_type==PNG_COLOR_TYPE_PALETTE) {
-+ if (color_type==PNG_COLOR_TYPE_PALETTE) {
- png_set_expand(png_ptr);
- png_read_update_info(png_ptr, info_ptr);
- }
-- if (info_ptr->num_trans) {
-+ png_get_tRNS(png_ptr,info_ptr,&trans_alpha,&num_trans,&trans_color);
-+ if (num_trans) {
- png_set_tRNS_to_alpha(png_ptr);
- png_read_update_info(png_ptr, info_ptr);
- }
-
-- bpp = info_ptr->pixel_depth / 8;
-- *width = info_ptr->width;
-- *height = info_ptr->height;
-+ png_get_IHDR(png_ptr,info_ptr,width,height,&bit_depth,&color_type,NULL,NULL,NULL);
-
-- switch (info_ptr->pixel_depth) {
-- case 8:
-+ switch (color_type) {
-+ case PNG_COLOR_TYPE_GRAY:
- *pixel_format = GF_PIXEL_GREYSCALE;
- break;
-- case 16:
-+ case PNG_COLOR_TYPE_GRAY_ALPHA:
- *pixel_format = GF_PIXEL_ALPHAGREY;
- break;
-- case 24:
-+ case PNG_COLOR_TYPE_RGB:
- *pixel_format = GF_PIXEL_RGB_24;
- break;
-- case 32:
-+ case PNG_COLOR_TYPE_RGB_ALPHA:
- *pixel_format = GF_PIXEL_RGBA;
- break;
- default:
-@@ -469,18 +473,17 @@ GF_Err gf_img_png_dec(char *png, u32 png
- }
-
- /*new cfg, reset*/
-- if (*dst_size != info_ptr->width * info_ptr->height * bpp) {
-- *dst_size = info_ptr->width * info_ptr->height * bpp;
-+ if (*dst_size != png_get_rowbytes(png_ptr, info_ptr) * png_get_image_height(png_ptr,info_ptr)) {
-+ *dst_size = png_get_rowbytes(png_ptr, info_ptr) * png_get_image_height(png_ptr,info_ptr);
- png_destroy_info_struct(png_ptr,(png_infopp) & info_ptr);
- png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
- return GF_BUFFER_TOO_SMALL;
- }
-- *dst_size = info_ptr->width * info_ptr->height * bpp;
-
- /*read*/
- stride = png_get_rowbytes(png_ptr, info_ptr);
-- rows = (png_bytepp) malloc(sizeof(png_bytep) * info_ptr->height);
-- for (i=0; i<info_ptr->height; i++) {
-+ rows = (png_bytepp) malloc(sizeof(png_bytep) * png_get_image_height(png_ptr,info_ptr));
-+ for (i=0; i<png_get_image_height(png_ptr,info_ptr); i++) {
- rows[i] = dst + i*stride;
- }
- png_read_image(png_ptr, rows);
-@@ -495,7 +498,7 @@ GF_Err gf_img_png_dec(char *png, u32 png
-
- void my_png_write(png_structp png, png_bytep data, png_size_t size)
- {
-- GFpng *p = (GFpng *)png->io_ptr;
-+ GFpng *p = (GFpng *)png_get_io_ptr(png);
- memcpy(p->buffer+p->pos, data, sizeof(char)*size);
- p->pos += size;
- }
+++ /dev/null
-https://bugs.gentoo.org/show_bug.cgi?id=361359
-
-Index: gpac/modules/img_in/jp2_dec.c
-===================================================================
---- gpac.orig/modules/img_in/jp2_dec.c
-+++ gpac/modules/img_in/jp2_dec.c
-@@ -340,9 +340,16 @@ static GF_Err JP2_ProcessData(GF_MediaDe
- return GF_OK;
- }
-
-+char opj_version_buffer[500];
-+
- static const char *JP2_GetCodecName(GF_BaseDecoder *dec)
- {
-+#ifndef OPENJPEG_VERSION
-+ snprintf(opj_version_buffer, sizeof(opj_version_buffer), "OpenJPEG %s", opj_version());
-+ return opj_version_buffer;
-+#else
- return "OpenJPEG "OPENJPEG_VERSION ;
-+#endif
- }
-
-
+++ /dev/null
-Index: gpac/modules/ffmpeg_in/ffmpeg_decode.c
-===================================================================
---- gpac.orig/modules/ffmpeg_in/ffmpeg_decode.c
-+++ gpac/modules/ffmpeg_in/ffmpeg_decode.c
-@@ -111,7 +111,7 @@ static GF_Err FFDEC_AttachStream(GF_Base
- bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
- codec_id = gf_bs_read_u32(bs);
- if (ffd->st==GF_STREAM_AUDIO) {
-- ffd->ctx->codec_type = CODEC_TYPE_AUDIO;
-+ ffd->ctx->codec_type = AVMEDIA_TYPE_AUDIO;
- ffd->ctx->sample_rate = gf_bs_read_u32(bs);
- ffd->ctx->channels = gf_bs_read_u16(bs);
- ffd->ctx->frame_size = gf_bs_read_u16(bs);
-@@ -121,7 +121,7 @@ static GF_Err FFDEC_AttachStream(GF_Base
- /*ffmpeg specific*/
- ffd->ctx->block_align = gf_bs_read_u16(bs);
- } else if (ffd->st==GF_STREAM_VISUAL) {
-- ffd->ctx->codec_type = CODEC_TYPE_VIDEO;
-+ ffd->ctx->codec_type = AVMEDIA_TYPE_VIDEO;
- ffd->ctx->width = gf_bs_read_u16(bs);
- ffd->ctx->height = gf_bs_read_u16(bs);
- }
-@@ -138,7 +138,7 @@ static GF_Err FFDEC_AttachStream(GF_Base
- bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
- codec_id = gf_bs_read_u32(bs);
- if (ffd->st==GF_STREAM_AUDIO) {
-- ffd->ctx->codec_type = CODEC_TYPE_AUDIO;
-+ ffd->ctx->codec_type = AVMEDIA_TYPE_AUDIO;
- ffd->ctx->sample_rate = gf_bs_read_u32(bs);
- ffd->ctx->channels = gf_bs_read_u16(bs);
- ffd->ctx->frame_size = gf_bs_read_u16(bs);
-@@ -151,7 +151,7 @@ static GF_Err FFDEC_AttachStream(GF_Base
- ffd->ctx->frame_size = 160;
- }
- } else if (ffd->st==GF_STREAM_VISUAL) {
-- ffd->ctx->codec_type = CODEC_TYPE_VIDEO;
-+ ffd->ctx->codec_type = AVMEDIA_TYPE_VIDEO;
- ffd->ctx->width = gf_bs_read_u16(bs);
- ffd->ctx->height = gf_bs_read_u16(bs);
- }
-@@ -163,7 +163,7 @@ static GF_Err FFDEC_AttachStream(GF_Base
- else {
- u32 codec_id = 0;
- if (ffd->st==GF_STREAM_VISUAL) {
-- ffd->ctx->codec_type = CODEC_TYPE_VIDEO;
-+ ffd->ctx->codec_type = AVMEDIA_TYPE_VIDEO;
- switch (ffd->oti) {
- case 0x20:
- codec_id = CODEC_ID_MPEG4;
-@@ -190,7 +190,7 @@ static GF_Err FFDEC_AttachStream(GF_Base
- break;
- }
- } else if (ffd->st==GF_STREAM_AUDIO) {
-- ffd->ctx->codec_type = CODEC_TYPE_AUDIO;
-+ ffd->ctx->codec_type = AVMEDIA_TYPE_AUDIO;
- switch (ffd->oti) {
- case 0x69:
- case 0x6B:
-@@ -412,20 +412,20 @@ static GF_Err FFDEC_ProcessData(GF_Media
-
- /*WARNING: this breaks H264 (and maybe others) decoding, disabled for now*/
- #if 1
-- if (!ffd->ctx->hurry_up) {
-+ if (ffd->ctx->skip_frame=AVDISCARD_DEFAULT) {
- switch (mmlevel) {
- case GF_CODEC_LEVEL_SEEK:
- case GF_CODEC_LEVEL_DROP:
- /*skip as much as possible*/
-- ffd->ctx->hurry_up = 5;
-+ ffd->ctx->skip_frame = AVDISCARD_ALL;
- break;
- case GF_CODEC_LEVEL_VERY_LATE:
- case GF_CODEC_LEVEL_LATE:
- /*skip B-frames*/
-- ffd->ctx->hurry_up = 1;
-+ ffd->ctx->skip_frame = AVDISCARD_BIDIR;
- break;
- default:
-- ffd->ctx->hurry_up = 0;
-+ ffd->ctx->skip_frame = AVDISCARD_DEFAULT;
- break;
- }
- }
-@@ -452,7 +452,7 @@ redecode:
- if (len<0) { ffd->frame_start = 0; return GF_NON_COMPLIANT_BITSTREAM; }
- if (gotpic<0) { ffd->frame_start = 0; return GF_OK; }
-
-- ffd->ctx->hurry_up = 0;
-+ ffd->ctx->skip_frame = AVDISCARD_DEFAULT;
-
- if (ffd->ctx->frame_size < gotpic) ffd->ctx->frame_size = gotpic;
-
-@@ -553,7 +553,7 @@ redecode:
- }
- }
- }
-- ffd->ctx->hurry_up = 0;
-+ ffd->ctx->skip_frame = AVDISCARD_DEFAULT;
- /*recompute outsize in case on-the-fly change*/
- if ((w != ffd->ctx->width) || (h != ffd->ctx->height)) {
- outsize = ffd->ctx->width * ffd->ctx->height * 3;
-Index: gpac/modules/ffmpeg_in/ffmpeg_demux.c
-===================================================================
---- gpac.orig/modules/ffmpeg_in/ffmpeg_demux.c
-+++ gpac/modules/ffmpeg_in/ffmpeg_demux.c
-@@ -233,10 +233,10 @@ static Bool FFD_CanHandleURL(GF_InputSer
- for(i = 0; i < ctx->nb_streams; i++) {
- AVCodecContext *enc = ctx->streams[i]->codec;
- switch(enc->codec_type) {
-- case CODEC_TYPE_AUDIO:
-+ case AVMEDIA_TYPE_AUDIO:
- if (!has_audio) has_audio = 1;
- break;
-- case CODEC_TYPE_VIDEO:
-+ case AVMEDIA_TYPE_VIDEO:
- if (!has_video) has_video= 1;
- break;
- default:
-@@ -552,13 +552,13 @@ static GF_Err FFD_ConnectService(GF_Inpu
- for (i = 0; i < ffd->ctx->nb_streams; i++) {
- AVCodecContext *enc = ffd->ctx->streams[i]->codec;
- switch(enc->codec_type) {
-- case CODEC_TYPE_AUDIO:
-+ case AVMEDIA_TYPE_AUDIO:
- if ((ffd->audio_st<0) && (ffd->service_type!=1)) {
- ffd->audio_st = i;
- ffd->audio_tscale = ffd->ctx->streams[i]->time_base;
- }
- break;
-- case CODEC_TYPE_VIDEO:
-+ case AVMEDIA_TYPE_VIDEO:
- if ((ffd->video_st<0) && (ffd->service_type!=2)) {
- ffd->video_st = i;
- ffd->video_tscale = ffd->ctx->streams[i]->time_base;
+++ /dev/null
-Index: gpac/modules/ffmpeg_in/ffmpeg_demux.c
-===================================================================
---- gpac.orig/modules/ffmpeg_in/ffmpeg_demux.c
-+++ gpac/modules/ffmpeg_in/ffmpeg_demux.c
-@@ -531,10 +531,10 @@ static GF_Err FFD_ConnectService(GF_Inpu
-
- switch (i) {
- case 0: e = GF_OK; break;
-- case AVERROR_IO: e = GF_URL_ERROR; goto err_exit;
-- case AVERROR_INVALIDDATA: e = GF_NON_COMPLIANT_BITSTREAM; goto err_exit;
-- case AVERROR_NOMEM: e = GF_OUT_OF_MEM; goto err_exit;
-- case AVERROR_NOFMT: e = GF_NOT_SUPPORTED; goto err_exit;
-+ case AVERROR(EIO): e = GF_URL_ERROR; goto err_exit;
-+ case AVERROR(EINVAL): e = GF_NON_COMPLIANT_BITSTREAM; goto err_exit;
-+ case AVERROR(ENOMEM): e = GF_OUT_OF_MEM; goto err_exit;
-+ case AVERROR(EILSEQ): e = GF_NOT_SUPPORTED; goto err_exit;
- default: e = GF_SERVICE_ERROR; goto err_exit;
- }
-
---- gpac/modules/amr_float_dec/Makefile.orig 2007-08-28 14:51:20.000000000 +0200
-+++ gpac/modules/amr_float_dec/Makefile 2011-03-27 21:37:20.585733920 +0200
+--- gpac/modules/amr_float_dec/Makefile.orig 2011-04-21 17:06:51.000000000 +0200
++++ gpac/modules/amr_float_dec/Makefile 2012-06-15 19:19:05.988610730 +0200
@@ -18,19 +18,19 @@
#common obj
OBJS=../amr_dec/amr_in.o amr_float_dec.o
CFLAGS+=-DGPAC_HAS_AMR_FT
ifeq ($(CONFIG_AMR_NB_FT), yes)
-OBJS+=./amr_nb_ft/interf_dec.o ./amr_nb_ft/interf_enc.o ./amr_nb_ft/sp_dec.o ./amr_nb_ft/sp_enc.o
-+AMR_LIBS=-lamrnb
++AMR_LIBS+=-lamrnb
endif
-OBJS+=./amr_wb_ft/dec_acelp.o ./amr_wb_ft/dec_dtx.o ./amr_wb_ft/dec_gain.o ./amr_wb_ft/dec_if.o ./amr_wb_ft/dec_lpc.o ./amr_wb_ft/dec_main.o \
- ./amr_wb_ft/dec_rom.o ./amr_wb_ft/dec_util.o ./amr_wb_ft/enc_acelp.o ./amr_wb_ft/enc_dtx.o ./amr_wb_ft/enc_gain.o ./amr_wb_ft/enc_if.o \
- ./amr_wb_ft/enc_lpc.o ./amr_wb_ft/enc_main.o ./amr_wb_ft/enc_rom.o ./amr_wb_ft/enc_util.o ./amr_wb_ft/if_rom.o
-+AMR_LIBS=-lamrwb
++AMR_LIBS+=-lamrwb
endif
-@@ -51,7 +51,7 @@
+@@ -45,7 +45,7 @@
- $(LIB): $(OBJSPIC)
-- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac
-+ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac $(AMR_LIBS)
+ $(LIB): $(OBJS)
+- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac
++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac $(AMR_LIBS)
%.o: %.c
+--- gpac/modules/amr_float_dec/amr_float_dec.c.orig 2012-03-28 14:43:41.000000000 +0200
++++ gpac/modules/amr_float_dec/amr_float_dec.c 2012-06-15 19:20:41.675273381 +0200
+@@ -45,12 +45,12 @@
+
+ #ifdef GPAC_HAS_AMR_FT
+ /*AMR WB*/
+-#include "amr_nb_ft/interf_dec.h"
++#include "amrnb/interf_dec.h"
+ #endif
+
+ #ifdef GPAC_HAS_AMR_FT_WB
+ /*AMR WB*/
+-#include "amr_wb_ft/dec_if.h"
++#include "amrwb/dec_if.h"
+ #endif
+
+ #endif
--- /dev/null
+--- gpac/applications/Makefile.orig 2012-05-22 23:29:22.000000000 +0200
++++ gpac/applications/Makefile 2012-06-16 18:26:34.918450437 +0200
+@@ -17,15 +17,15 @@
+ INSTDIRS=mp4client
+ ifeq ($(CONFIG_XUL),no)
+ else
+-#INSTDIRS+=osmozilla
+-#APPDIRS+=osmozilla
++INSTDIRS+=osmozilla
++APPDIRS+=osmozilla
+ endif
+
+ #disable due to version incompatibilities
+ ifeq ($(USE_WXWIDGETS), yes)
+-#APPDIRS+=osmo4_wx
++APPDIRS+=osmo4_wx
+ #V4STUDIODIR=V4Studio
+-#INSTDIRS+=osmo4_wx
++INSTDIRS+=osmo4_wx
+ endif
+
+ ALLDIRS=$(APPDIRS)
--- /dev/null
+--- gpac/src/terminal/terminal.c.orig 2012-05-23 20:57:42.000000000 +0200
++++ gpac/src/terminal/terminal.c 2012-06-17 09:20:24.582866480 +0200
+@@ -1866,6 +1866,7 @@ u32 gf_term_sample_clocks(GF_Terminal *t
+ return 0;
+ }
+
++GF_EXPORT
+ const char *gf_term_get_text_selection(GF_Terminal *term, Bool probe_only)
+ {
+ Bool has_text;
+@@ -1876,7 +1877,7 @@ const char *gf_term_get_text_selection(G
+ return gf_sc_get_selected_text(term->compositor);
+ }
+
+-
++GF_EXPORT
+ GF_Err gf_term_paste_text(GF_Terminal *term, const char *txt, Bool probe_only)
+ {
+ if (!term) return GF_BAD_PARAM;
+--- gpac/src/terminal/object_browser.c.orig 2012-03-27 11:48:05.000000000 +0200
++++ gpac/src/terminal/object_browser.c 2012-06-17 09:21:02.492864890 +0200
+@@ -102,6 +102,7 @@ u32 gf_term_object_subscene_type(GF_Term
+ }
+
+ /*select given object when stream selection is available*/
++GF_EXPORT
+ void gf_term_select_object(GF_Terminal *term, GF_ObjectManager *odm)
+ {
+ if (!term || !odm) return;
+--- gpac/src/utils/os_divers.c.orig 2012-04-04 16:47:33.000000000 +0200
++++ gpac/src/utils/os_divers.c 2012-06-17 09:22:03.782862317 +0200
+@@ -311,6 +311,7 @@ void gf_move_file(const char *fileName,
+ #endif
+ }
+
++GF_EXPORT
+ void gf_rand_init(Bool Reset)
+ {
+ if (Reset) {
+@@ -324,6 +325,7 @@ void gf_rand_init(Bool Reset)
+ }
+ }
+
++GF_EXPORT
+ u32 gf_rand()
+ {
+ return rand();
+++ /dev/null
---- gpac/modules/ffmpeg_in/ffmpeg_in.h.orig 2008-10-20 13:04:40.000000000 +0200
-+++ gpac/modules/ffmpeg_in/ffmpeg_in.h 2011-03-28 19:44:02.765729730 +0200
-@@ -56,14 +56,14 @@
-
-
- /*include FFMPEG APIs*/
--#include <ffmpeg/avformat.h>
-+#include <libavformat/avformat.h>
-
- void gf_av_vlog(void* avcl, int level, const char *fmt, va_list vl);
-
-
- #if LIBAVCODEC_VERSION_INT > ((52<<16)+(0<<8)+0)
- #define FFMPEG_SWSCALE
--#include <ffmpeg/swscale.h>
-+#include <libswscale/swscale.h>
- #endif
-
- /*FFMPEG decoder module */
---- gpac/configure.orig 2011-03-27 21:38:49.493737273 +0200
-+++ gpac/configure 2011-03-28 19:44:22.401729730 +0200
-@@ -732,7 +732,7 @@ fi
- #look for FFMPEG support
- cat > $TMPC << EOF
- #include <stddef.h>
--#include <ffmpeg/avcodec.h>
-+#include <libavcodec/avcodec.h>
- int main( void ) { return 0; }
- EOF
-
---- gpac/modules/ffmpeg_in/ffmpeg_decode.c.orig 2008-11-28 18:26:06.000000000 +0100
-+++ gpac/modules/ffmpeg_in/ffmpeg_decode.c 2011-03-28 20:33:19.441729730 +0200
-@@ -241,7 +241,7 @@
-
- /*setup audio streams*/
- if (ffd->st==GF_STREAM_AUDIO) {
-- if ((ffd->codec->type == CODEC_ID_MP3LAME) || (ffd->codec->type == CODEC_ID_MP2)) {
-+ if ((ffd->codec->type == CODEC_ID_MP3) || (ffd->codec->type == CODEC_ID_MP2)) {
- ffd->ctx->frame_size = (ffd->ctx->sample_rate > 24000) ? 1152 : 576;
- }
- /*may be 0 (cfg not known yet)*/
-@@ -643,7 +643,7 @@
- NULL, NULL, NULL);
-
- if (ffd->sws_ctx)
-- sws_scale(ffd->sws_ctx, ffd->frame->data, ffd->frame->linesize, 0, ffd->ctx->height->codec->height, pict.data, pict.linesize);
-+ sws_scale(ffd->sws_ctx, ffd->frame->data, ffd->frame->linesize, 0, ffd->ctx->height, pict.data, pict.linesize);
-
- #endif
-
---- gpac/configure.orig 2011-05-29 20:37:20.841571383 +0200
-+++ gpac/configure 2011-05-29 20:50:56.841598707 +0200
-@@ -102,7 +102,7 @@
- bigendian="no"
- SHFLAGS=-shared
- need_inet_aton="no"
--LDFLAGS="$LDFLAGS -Wl --warn-common"
-+LDFLAGS="$LDFLAGS -Wl,--warn-common"
- CFLAGS=""
- CPPFLAGS=""
- GPAC_SH_FLAGS=-lpthread
---- gpac/applications/osmo4_wx/Makefile.orig 2011-05-29 20:52:03.848267616 +0200
-+++ gpac/applications/osmo4_wx/Makefile 2011-05-29 21:08:38.408300918 +0200
-@@ -41,7 +41,7 @@
+--- gpac/applications/osmo4_wx/Makefile.orig 2012-06-17 07:51:02.389758176 +0200
++++ gpac/applications/osmo4_wx/Makefile 2012-06-17 08:25:05.746339091 +0200
+@@ -45,7 +45,7 @@
all: $(PROG)
Osmo4$(EXE): $(OBJS)
-- $(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(WX_LFLAGS) -lz
-+ $(CXX) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(WX_LFLAGS) `pkg-config --libs gtk+-2.0` -lz
+- $(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(WX_LFLAGS) $(LINKFLAGS)
++ $(CXX) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(WX_LFLAGS) `pkg-config --libs gtk+-2.0` $(LINKFLAGS)
%.o: %.cpp
- $(CXX) $(CFLAGS) $(INSTALL_FLAGS) $(WX_CFLAGS) -c -o $@ $<
---- gpac/src/Makefile~ 2011-07-24 16:46:39.000000000 +0200
-+++ gpac/src/Makefile 2011-07-24 16:53:33.607729885 +0200
-@@ -106,14 +106,6 @@
- endif
-
+ $(CXX) $(CFLAGS) $(WX_CFLAGS) -c -o $@ $<
+--- gpac/src/Makefile.orig 2012-05-23 20:57:42.000000000 +0200
++++ gpac/src/Makefile 2012-06-15 20:44:50.881728154 +0200
+@@ -195,15 +195,6 @@
+ ## libgpac compositor compilation options
+ COMPOSITOR_CFLAGS=
+-## Add prefix before every lib
-ifneq ($(prefix), /usr/local)
-EXTRALIBS+=-L$(prefix)/lib
-else
-endif
-endif
-
- ## libgpac compositor compilation options
- COMPOSITOR_CFLAGS=
- ## SVG disabled
---- gpac/applications/mp4client/Makefile~ 2011-07-24 16:54:03.000000000 +0200
-+++ gpac/applications/mp4client/Makefile 2011-07-24 16:57:28.613989434 +0200
-@@ -37,18 +37,6 @@
- PROG=MP4Client
- endif
-
--ifneq ($(CONFIG_JPEG), no)
--LINKLIBS+= -L$(prefix)/lib
--else
--ifneq ($(CONFIG_PNG), no)
--LINKLIBS+= -L$(prefix)/lib
--else
--ifneq ($(TRISCOPE_MODE), no)
--LINKLIBS+= -L$(prefix)/lib
--endif
--endif
--endif
--
- ifeq ($(CONFIG_JPEG), no)
- else
- LINKLIBS+= -ljpeg
---- gpac/modules/jack/Makefile~ 2008-11-24 10:14:19.000000000 +0100
-+++ gpac/modules/jack/Makefile 2011-07-24 17:01:53.625253667 +0200
-@@ -32,7 +32,7 @@
+ ## OpenGL available
+ ifeq ($(HAS_OPENGL),yes)
+ EXTRALIBS+= $(OGL_LIBS)
+--- gpac/modules/jack/Makefile.orig 2012-04-05 14:38:11.000000000 +0200
++++ gpac/modules/jack/Makefile 2012-06-15 20:46:05.045058375 +0200
+@@ -25,7 +25,7 @@
all: $(LIB)
- $(LIB): $(OBJSPIC)
-- $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac -L/usr/lib -ljack
-+ $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac -ljack
+ $(LIB): $(OBJS)
+- $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac -L/usr/lib -ljack
++ $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac -ljack
%.o: %.c
---- gpac/applications/mp4client/Makefile.orig 2008-11-24 09:44:26.000000000 +0100
-+++ gpac/applications/mp4client/Makefile 2011-04-01 18:56:48.041739787 +0200
-@@ -87,7 +87,7 @@ MP4Client$(EXE): $(OBJS)
+--- gpac/applications/osmo4_wx/Makefile.orig 2011-10-21 14:41:56.000000000 +0200
++++ gpac/applications/osmo4_wx/Makefile 2012-06-15 20:20:49.688455299 +0200
+@@ -67,7 +67,6 @@
+ $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/MacOS
+ echo -n 'APPLOsm4' > $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/PkgInfo
+ else
+- rm -f wxOsmo4.o
+ mkdir -p $(DESTDIR)$(prefix)/bin
+ install -m 755 $(INSTFLAGS) ../../bin/gcc/Osmo4 "$(DESTDIR)$(prefix)/bin"
+ endif
+--- gpac/applications/mp4client/Makefile.orig 2011-05-20 19:11:05.000000000 +0200
++++ gpac/applications/mp4client/Makefile 2012-06-15 20:20:27.218456243 +0200
+@@ -44,7 +44,7 @@
clean:
rm -f $(OBJS) ../../bin/gcc/$(PROG)
-install: clean
+install:
- $(MAKE) -override BUILD_INSTALL=yes all
install -m 755 $(INSTFLAGS) ../../bin/gcc/MP4Client "$(DESTDIR)$(prefix)/bin"
---- gpac/applications/osmo4_wx/Makefile.orig 2008-11-24 09:48:32.000000000 +0100
-+++ gpac/applications/osmo4_wx/Makefile 2011-04-01 18:57:49.669735597 +0200
-@@ -63,7 +63,6 @@ ifeq ($(CONFIG_DARWIN),yes)
- $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/MacOS
- echo -n 'APPLOsm4' > $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/PkgInfo
- else
-- rm -f wxOsmo4.o
- $(MAKE) -override BUILD_INSTALL=yes all
- mkdir -p $(DESTDIR)$(prefix)/bin
- install -m 755 $(INSTFLAGS) ../../bin/gcc/Osmo4 "$(DESTDIR)$(prefix)/bin"
+ uninstall:
--- /dev/null
+--- gpac/configure.orig 2012-06-15 21:26:23.188290228 +0200
++++ gpac/configure 2012-06-15 22:10:36.141512228 +0200
+@@ -691,7 +691,7 @@
+ #dc added
+ else
+ #try pkg-config
+- if $pkg_config --exists mozilla-js 2> /dev/null ; then
++ if $pkg_config --exists nomozilla-js 2> /dev/null ; then
+ js_flags=`$pkg_config --cflags mozilla-js`
+ js_lib_pkg=`$pkg_config --libs mozilla-js`
+ if $cc -o $TMPO $TMPC $js_flags $js_lib_pkg $LDFLAGS -lpthread 2> /dev/null ; then
+@@ -699,29 +699,13 @@
+ js_lib=`$pkg_config --libs mozilla-js`
+ fi
+ #try firefox folders (starting at ubuntu 11.10, no pkg-config)
+- elif ls -d /usr/lib/firefox* > /dev/null 2>&1 ; then
+- firefox_version=`cd /usr/lib ; ls -d firefox* | grep -v addons | grep -v devel ; cd - > /dev/null`
+- for i in $firefox_version ; do
+- if test "$has_js" = "no" ; then
+- js_inc="/usr/include/$i"
+- js_flags="-DXP_UNIX -I$js_inc"
+- js_lib="-L/usr/lib/$i/ -lxul -lmozsqlite3 -lmozalloc -lnssutil3 -lnss3 -lnspr4 -lsmime3"
+- if $cc -o $TMPO $TMPC $js_flags $js_lib 2> /dev/null ; then
+- has_js="$i"
+- elif $cc -o $TMPO $TMPC $js_flags -lnssutil3 $js_lib -lssl3 2> /dev/null ; then
+- #firefox 11 compatibility
+- has_js="$i"
+- js_lib="-lnssutil3 $js_lib -lssl3"
+- fi
+- fi
+- done
+ fi
+
+ if test "$has_js" = "no" ; then
+ #try prefix (DC)
+ js_inc="$prefix/include/js"
+ js_flags="-DXP_UNIX -I$prefix/include/js"
+- if $cc -o $TMPO $TMPC $js_flags -L$prefix/lib -ljs -lpthread 2> /dev/null ; then
++ if $cc -o $TMPO $TMPC $js_flags -ljs -lpthread 2> /dev/null ; then
+ has_js="prefix"
+ #dc added end
+ else
+@@ -782,7 +766,7 @@
+ #try prefix (DC)
+ js_inc="$prefix/include/js"
+ js_flags="-DXP_UNIX -I$prefix/include/js"
+- if $cc -o $TMPO $TMPC $js_flags -L$prefix/lib -ljs 2> /dev/null ; then
++ if $cc -o $TMPO $TMPC $js_flags -ljs 2> /dev/null ; then
+ has_js="prefix"
+ #dc added end
+ else
+++ /dev/null
---- gpac/src/media_tools/img.c.orig 2008-12-01 18:39:36.000000000 +0100
-+++ gpac/src/media_tools/img.c 2011-02-05 08:34:05.764692227 +0100
-@@ -551,7 +551,7 @@
- /* Allocate/initialize the image information data. REQUIRED */
- info_ptr = png_create_info_struct(png_ptr);
- if (info_ptr == NULL) {
-- png_destroy_write_struct(&png_ptr, png_infopp_NULL);
-+ png_destroy_write_struct(&png_ptr, NULL);
- return GF_IO_ERR;
- }
-
+++ /dev/null
---- gpac/src/Makefile.orig 2008-12-02 15:01:08.000000000 +0100
-+++ gpac/src/Makefile 2011-02-09 16:26:58.340693904 +0100
-@@ -174,6 +174,10 @@
- endif
-
- ifeq ($(WANT_PIC),yes)
-+LIBGPAC_MCRYPT_PIC=$(LIBGPAC_MCRYPT:.o=.opic)
-+LIBGPAC_SCENE_PIC=$(LIBGPAC_SCENE:.o=.opic)
-+LIBGPAC_MEDIATOOLS_PIC=$(LIBGPAC_MEDIATOOLS:.o=.opic)
-+LIBGPAC_COMPOSITOR_PIC=$(LIBGPAC_COMPOSITOR:.o=.opic)
- OBJSPIC=$(OBJS:.o=.opic)
- else
- OBJSPIC=$(OBJS)
-@@ -192,23 +196,19 @@
- lib: $(LIB)
-
- #there's a bunch of warnings in there, get rid of them
--mcrypt: CFLAGS= $(OPTFLAGS) -w -I$(SRC_PATH)/include
--mcrypt: $(LIBGPAC_MCRYPT)
-+$(LIBGPAC_MCRYPT) $(LIBGPAC_MCRYPT_PIC): CFLAGS= $(OPTFLAGS) -w -I$(SRC_PATH)/include
-
--scenegraph: CFLAGS += $(SCENEGRAPH_CFLAGS)
--scenegraph: $(LIBGPAC_SCENE)
-+$(LIBGPAC_SCENE) $(LIBGPAC_SCENE_PIC): CFLAGS += $(SCENEGRAPH_CFLAGS)
-
--mediatools: CFLAGS += $(MEDIATOOLS_CFLAGS)
--mediatools: $(LIBGPAC_MEDIATOOLS)
-+$(LIBGPAC_MEDIATOOLS) $(LIBGPAC_MEDIATOOLS_PIC): CFLAGS += $(MEDIATOOLS_CFLAGS)
-
--compositor: CFLAGS+=$(COMPOSITOR_CFLAGS)
--compositor: $(LIBGPAC_COMPOSITOR)
-+$(LIBGPAC_COMPOSITOR) $(LIBGPAC_COMPOSITOR_PIC): CFLAGS+=$(COMPOSITOR_CFLAGS)
-
- %.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
-
--$(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) $(LIBGPAC_ISOM) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) compositor scenegraph mediatools mcrypt $(OBJSPIC)
-+$(LIB): $(OBJS) $(OBJSPIC)
- ar cr ../bin/gcc/libgpac_static.a $(OBJS)
- ranlib ../bin/gcc/libgpac_static.a
- $(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o ../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS)
---- gpac/applications/osmozilla/npplat.h.orig 2005-07-13 16:34:30.000000000 +0200
-+++ gpac/applications/osmozilla/npplat.h 2011-03-20 09:34:57.624712082 +0100
-@@ -49,7 +49,7 @@
- #endif
-
- #include "npapi.h"
--#include "npupp.h"
-+#include "npfunctions.h"
-
- /**************************************************/
- /* */
---- gpac/applications/osmozilla/osmozilla.h.orig 2008-10-06 17:17:57.000000000 +0200
-+++ gpac/applications/osmozilla/osmozilla.h 2011-03-20 10:04:41.876713758 +0100
-@@ -39,6 +39,7 @@
- #define __PLUGIN_H__
-
- #include <nsIClassInfo.h>
-+#include <nsIProgrammingLanguage.h>
-
- #include "npplat.h"
- #include "nsIOsmozilla.h"
-@@ -104,7 +104,7 @@
-
- // global to get plugins name & description
- NPError NS_PluginGetValue(NPPVariable aVariable, void *aValue);
--char* NPP_GetMIMEDescription(void);
-+const char* NPP_GetMIMEDescription(void);
-
-
- //#define NO_GPAC
---- gpac/applications/osmozilla/osmozilla.cpp.orig 2008-10-06 17:17:57.000000000 +0200
-+++ gpac/applications/osmozilla/osmozilla.cpp 2011-03-20 10:12:46.068709568 +0100
-@@ -856,19 +856,19 @@
- return NS_ERROR_NULL_POINTER;
-
- if (aIID.Equals(kIZillaPluginIID)) {
-- *aInstancePtr = NS_STATIC_CAST(nsIOsmozilla *, this);
-+ *aInstancePtr = static_cast<nsIOsmozilla *>(this);
- AddRef();
- return NS_OK;
- }
-
- if (aIID.Equals(kIClassInfoIID)) {
-- *aInstancePtr = NS_STATIC_CAST(nsIClassInfo *, this);
-+ *aInstancePtr = static_cast<nsIClassInfo *>(this);
- AddRef();
- return NS_OK;
- }
-
- if (aIID.Equals(kISupportsIID)) {
-- *aInstancePtr = NS_STATIC_CAST(nsISupports *, (NS_STATIC_CAST (nsIOsmozilla *, this)));
-+ *aInstancePtr = static_cast<nsISupports *>((static_cast<nsIOsmozilla *>(this)));
- AddRef();
- return NS_OK;
- }
---- gpac/applications/osmozilla/npn_gate.cpp.orig 2005-07-13 16:34:29.000000000 +0200
-+++ gpac/applications/osmozilla/npn_gate.cpp 2011-03-20 10:24:21.496702863 +0100
-@@ -58,7 +58,7 @@
- NPError rv = NPERR_NO_ERROR;
-
- if( navMinorVers >= NPVERS_HAS_NOTIFICATION )
-- rv = CallNPN_GetURLNotifyProc(NPNFuncs.geturlnotify, instance, url, target, notifyData);
-+ rv = (*NPNFuncs.geturlnotify)(instance, url, target, notifyData);
- else
- rv = NPERR_INCOMPATIBLE_VERSION_ERROR;
-
-@@ -67,32 +67,32 @@
-
- NPError NPN_GetURL(NPP instance, const char *url, const char *target)
- {
-- NPError rv = CallNPN_GetURLProc(NPNFuncs.geturl, instance, url, target);
-+ NPError rv = (*NPNFuncs.geturl)(instance, url, target);
- return rv;
- }
-
--NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file, void* notifyData)
-+NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file, void* notifyData)
- {
- int navMinorVers = NPNFuncs.version & 0xFF;
- NPError rv = NPERR_NO_ERROR;
-
- if( navMinorVers >= NPVERS_HAS_NOTIFICATION )
-- rv = CallNPN_PostURLNotifyProc(NPNFuncs.posturlnotify, instance, url, window, len, buf, file, notifyData);
-+ rv = (*NPNFuncs.posturlnotify)(instance, url, window, len, buf, file, notifyData);
- else
- rv = NPERR_INCOMPATIBLE_VERSION_ERROR;
-
- return rv;
- }
-
--NPError NPN_PostURL(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file)
-+NPError NPN_PostURL(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file)
- {
-- NPError rv = CallNPN_PostURLProc(NPNFuncs.posturl, instance, url, window, len, buf, file);
-+ NPError rv = (*NPNFuncs.posturl)(instance, url, window, len, buf, file);
- return rv;
- }
-
- NPError NPN_RequestRead(NPStream* stream, NPByteRange* rangeList)
- {
-- NPError rv = CallNPN_RequestReadProc(NPNFuncs.requestread, stream, rangeList);
-+ NPError rv = (*NPNFuncs.requestread)(stream, rangeList);
- return rv;
- }
-
-@@ -103,20 +103,20 @@
- NPError rv = NPERR_NO_ERROR;
-
- if( navMinorVersion >= NPVERS_HAS_STREAMOUTPUT )
-- rv = CallNPN_NewStreamProc(NPNFuncs.newstream, instance, type, target, stream);
-+ rv = (*NPNFuncs.newstream)(instance, type, target, stream);
- else
- rv = NPERR_INCOMPATIBLE_VERSION_ERROR;
-
- return rv;
- }
-
--int32 NPN_Write(NPP instance, NPStream *stream, int32 len, void *buffer)
-+int32_t NPN_Write(NPP instance, NPStream *stream, int32_t len, void *buffer)
- {
- int navMinorVersion = NPNFuncs.version & 0xFF;
-- int32 rv = 0;
-+ int32_t rv = 0;
-
- if( navMinorVersion >= NPVERS_HAS_STREAMOUTPUT )
-- rv = CallNPN_WriteProc(NPNFuncs.write, instance, stream, len, buffer);
-+ rv = (*NPNFuncs.write)(instance, stream, len, buffer);
- else
- rv = -1;
-
-@@ -129,7 +129,7 @@
- NPError rv = NPERR_NO_ERROR;
-
- if( navMinorVersion >= NPVERS_HAS_STREAMOUTPUT )
-- rv = CallNPN_DestroyStreamProc(NPNFuncs.destroystream, instance, stream, reason);
-+ rv = (*NPNFuncs.destroystream)(instance, stream, reason);
- else
- rv = NPERR_INCOMPATIBLE_VERSION_ERROR;
-
-@@ -138,78 +138,78 @@
-
- void NPN_Status(NPP instance, const char *message)
- {
-- CallNPN_StatusProc(NPNFuncs.status, instance, message);
-+ (*NPNFuncs.status)(instance, message);
- }
-
- const char* NPN_UserAgent(NPP instance)
- {
- const char * rv = NULL;
-- rv = CallNPN_UserAgentProc(NPNFuncs.uagent, instance);
-+ rv = (*NPNFuncs.uagent)(instance);
- return rv;
- }
-
--void* NPN_MemAlloc(uint32 size)
-+void* NPN_MemAlloc(uint32_t size)
- {
- void * rv = NULL;
-- rv = CallNPN_MemAllocProc(NPNFuncs.memalloc, size);
-+ rv = (*NPNFuncs.memalloc)(size);
- return rv;
- }
-
- void NPN_MemFree(void* ptr)
- {
-- CallNPN_MemFreeProc(NPNFuncs.memfree, ptr);
-+ (*NPNFuncs.memfree)(ptr);
- }
-
--uint32 NPN_MemFlush(uint32 size)
-+uint32_t NPN_MemFlush(uint32_t size)
- {
-- uint32 rv = CallNPN_MemFlushProc(NPNFuncs.memflush, size);
-+ uint32_t rv = (*NPNFuncs.memflush)(size);
- return rv;
- }
-
- void NPN_ReloadPlugins(NPBool reloadPages)
- {
-- CallNPN_ReloadPluginsProc(NPNFuncs.reloadplugins, reloadPages);
-+ (*NPNFuncs.reloadplugins)(reloadPages);
- }
-
- #ifdef OJI
- JRIEnv* NPN_GetJavaEnv(void)
- {
- JRIEnv * rv = NULL;
-- rv = CallNPN_GetJavaEnvProc(NPNFuncs.getJavaEnv);
-+ rv = (*NPNFuncs.getJavaEnv)();
- return rv;
- }
-
- jref NPN_GetJavaPeer(NPP instance)
- {
- jref rv;
-- rv = CallNPN_GetJavaPeerProc(NPNFuncs.getJavaPeer, instance);
-+ rv = (*NPNFuncs.getJavaPeer)(instance);
- return rv;
- }
- #endif
-
- NPError NPN_GetValue(NPP instance, NPNVariable variable, void *value)
- {
-- NPError rv = CallNPN_GetValueProc(NPNFuncs.getvalue, instance, variable, value);
-+ NPError rv = (*NPNFuncs.getvalue)(instance, variable, value);
- return rv;
- }
-
- NPError NPN_SetValue(NPP instance, NPPVariable variable, void *value)
- {
-- NPError rv = CallNPN_SetValueProc(NPNFuncs.setvalue, instance, variable, value);
-+ NPError rv = (*NPNFuncs.setvalue)(instance, variable, value);
- return rv;
- }
-
- void NPN_InvalidateRect(NPP instance, NPRect *invalidRect)
- {
-- CallNPN_InvalidateRectProc(NPNFuncs.invalidaterect, instance, invalidRect);
-+ (*NPNFuncs.invalidaterect)(instance, invalidRect);
- }
-
- void NPN_InvalidateRegion(NPP instance, NPRegion invalidRegion)
- {
-- CallNPN_InvalidateRegionProc(NPNFuncs.invalidateregion, instance, invalidRegion);
-+ (*NPNFuncs.invalidateregion)(instance, invalidRegion);
- }
-
- void NPN_ForceRedraw(NPP instance)
- {
-- CallNPN_ForceRedrawProc(NPNFuncs.forceredraw, instance);
-+ (*NPNFuncs.forceredraw)(instance);
- }
---- gpac/configure.orig 2011-05-29 21:09:10.138301981 +0200
-+++ gpac/configure 2011-05-29 21:27:39.248339117 +0200
-@@ -1145,6 +1145,7 @@
-
- #look for GECKO support
- cat > $TMPCPP << EOF
-+#include <mozilla-config.h>
- #include <nsIServiceManager.h>
- int main( void ) { return 0; }
- EOF
---- gpac/applications/osmozilla/osmozilla.cpp~ 2012-01-22 17:15:26.902074831 +0100
-+++ gpac/applications/osmozilla/osmozilla.cpp 2012-01-22 17:17:43.514543060 +0100
-@@ -91,7 +91,7 @@
+--- gpac/applications/osmozilla/osmo_npapi.cpp.orig 2012-04-04 17:04:39.000000000 +0200
++++ gpac/applications/osmozilla/osmo_npapi.cpp 2012-06-17 07:42:36.879779391 +0200
+@@ -372,7 +372,7 @@
+ /* explicit plugin call */ \
"application/x-gpac::GPAC plugin;" \
-
--char* NPP_GetMIMEDescription(void)
-+const char* NPP_GetMIMEDescription(void)
- {
- return GPAC_PLUGIN_MIMETYPES;
- }
---- gpac/applications/osmozilla/np_entry.cpp~ 2005-07-13 16:34:30.000000000 +0200
-+++ gpac/applications/osmozilla/np_entry.cpp 2012-01-22 17:43:44.464387379 +0100
-@@ -172,7 +172,7 @@
- return NS_PluginInitialize();
- }
-
-char * NP_GetMIMEDescription(void)
+const char * NP_GetMIMEDescription(void)
{
- return NPP_GetMIMEDescription();
+ return (char *) GPAC_PLUGIN_MIMETYPES;
}
+# TODO:
+# - Platinum UPnP: http://www.plutinosoft.com/platinum
+# - AVCap: http://libavcap.sourceforge.net/
+# - OpenSVCDecoder: http://opensvcdecoder.sourceforge.net/
+# - libfreenect: http://openkinect.org/wiki/Main_Page
#
# Conditional build:
%bcond_with amr # AMR-NB and AMR-WB (floating-point) support
Summary: GPAC - an implementation of the MPEG-4 Systems standard (ISO/IEC 14496-1)
Summary(pl.UTF-8): GPAC - implementacja standardu MPEG-4 Systems (ISO/IEC 14496-1)
Name: gpac
-Version: 0.4.5
-Release: 15
+Version: 0.5.0
+Release: 1
License: LGPL v2+
Group: Applications/Multimedia
Source0: http://downloads.sourceforge.net/gpac/%{name}-%{version}.tar.gz
-# Source0-md5: 755e8c438a48ebdb13525dd491f5b0d1
+# Source0-md5: 19f7bb7c16913c22bdd453db1e653ca0
Patch0: %{name}-install.patch
-Patch1: %{name}-libpng.patch
-Patch2: %{name}-pic.patch
-Patch3: %{name}-xulrunner.patch
-Patch4: %{name}-amr.patch
-Patch5: %{name}-ffmpeg.patch
-Patch6: %{name}-install-is-not-clean.patch
-Patch7: %{name}-flags.patch
-Patch8: %{name}-idl_uuid.patch
-Patch9: 240_all_libpng15.patch
-Patch10: 250_all_openjpeg14.patch
-Patch11: 260_all_ffmpeg_bump.patch
-Patch12: 270_all_ffmpeg_trunk.patch
+Patch1: %{name}-xulrunner.patch
+Patch2: %{name}-amr.patch
+Patch3: %{name}-install-is-not-clean.patch
+Patch4: %{name}-flags.patch
+Patch5: %{name}-idl_uuid.patch
+Patch6: %{name}-js.patch
+Patch7: %{name}-apps.patch
+Patch8: %{name}-export.patch
URL: http://gpac.sourceforge.net/
+BuildRequires: DirectFB-devel
+BuildRequires: OpenGL-devel
BuildRequires: SDL-devel
BuildRequires: a52dec-libs-devel
BuildRequires: alsa-lib-devel >= 0.9
BuildRequires: libvorbis-devel
BuildRequires: libxml2-devel
BuildRequires: openjpeg-devel
+BuildRequires: openssl-devel
BuildRequires: pulseaudio-devel
BuildRequires: rpmbuild(macros) >= 1.357
BuildRequires: sed >= 4.0
BuildRequires: xorg-lib-libXv-devel
BuildRequires: xulrunner-devel >= 2:9.0.0
%{?with_xvid:BuildRequires: xvid-devel}
+BuildRequires: zlib-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
%description devel -l pl.UTF-8
Pliki nagłówkowe biblioteki GPAC.
+%package static
+Summary: Static GPAC library
+Summary(pl.UTF-8): Statyczna biblioteka GPAC
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description static
+Static GPAC library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka GPAC.
+
%package gui
Summary: wxWidgets-based GUI for GPAC
Summary(pl.UTF-8): Oparty na wxWidgets graficzny interfejs do GPAC
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%if %{with amr}
-sed -i -e 's/amr_\([nw]b\)_ft/amr\1/' modules/amr_float_dec/amr_float_dec.c
-%endif
sed -i -e 's/wx-config/wx-gtk2-unicode-config/' configure
chmod a+x configure
%build
-cd applications/osmozilla
-%{_libdir}/xulrunner-sdk/sdk/bin/header.py -I /usr/share/idl/xulrunner -o nsIOsmozilla.h nsIOsmozilla.idl
-%{_libdir}/xulrunner-sdk/sdk/bin/typelib.py -I /usr/share/idl/xulrunner -o nsIOsmozilla.xpt nsIOsmozilla.idl
-cp -f nsIOsmozilla.xpt nsIOsmozilla.xpt_linux
-cd ../..
-%configure \
+# not autoconf configure
+./configure \
+ --prefix=%{_prefix} \
+ --libdir=%{_lib} \
+ --mandir=%{_mandir} \
--X11-path=/usr \
--cc="%{__cc}" \
+ --cpp="%{__cxx}" \
--disable-opt \
%{!?with_wx:--disable-wx} \
%{?with_amr:--enable-amr} \
%{!?with_xvid:--use-xvid=no} \
--xulsdk-path="/usr/include/xulrunner -I/usr/include/nspr"
-%{__make} -j1 \
- BUILD_INSTALL=yes \
- CXX="%{__cxx} -fPIC" \
- libdir=%{_lib}
+%{__make} -j1
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
-%{__make} install \
+%{__make} install install-lib \
+ DESTDIR=$RPM_BUILD_ROOT
+
+%{__make} -C applications install \
DESTDIR=$RPM_BUILD_ROOT \
- libdir=%{_lib} \
MOZILLA_DIR=$RPM_BUILD_ROOT%{_browserpluginsdir}
-install -d $RPM_BUILD_ROOT%{_includedir}
-cp -a include/gpac $RPM_BUILD_ROOT%{_includedir}/gpac
-
%clean
rm -rf $RPM_BUILD_ROOT
%doc AUTHORS BUGS Changelog README TODO
%attr(755,root,root) %{_bindir}/MP4Box
%attr(755,root,root) %{_bindir}/MP4Client
-%attr(755,root,root) %{_libdir}/libgpac-%{version}.so
-%attr(755,root,root) %ghost %{_libdir}/libgpac.so
+%attr(755,root,root) %{_libdir}/libgpac.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgpac.so.2
%dir %{_libdir}/gpac
%attr(755,root,root) %{_libdir}/gpac/gm_*.so
%{_datadir}/gpac
%files devel
%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgpac.so
%{_includedir}/gpac
+%{_pkgconfigdir}/gpac.pc
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libgpac_static.a
%if %{with wx}
%files gui
projects / packages / gpac.git / commitdiff