From 5510d9d7d1c93c2ea71a2bd6f0666168808d5dd6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Mar 2018 04:54:42 +0000 Subject: gentoo resync : 18.03.2018 --- media-video/jubler/Manifest | 7 +- .../jubler/files/jubler-4.6.1-ffmpeg-1.patch | 274 --------------------- .../jubler/files/jubler-4.6.1-ffmpeg-2.patch | 37 --- media-video/jubler/files/jubler-4.6.1-gentoo.patch | 163 ------------ media-video/jubler/jubler-4.6.1-r3.ebuild | 98 -------- media-video/jubler/jubler-5.1.ebuild | 2 +- 6 files changed, 2 insertions(+), 579 deletions(-) delete mode 100644 media-video/jubler/files/jubler-4.6.1-ffmpeg-1.patch delete mode 100644 media-video/jubler/files/jubler-4.6.1-ffmpeg-2.patch delete mode 100644 media-video/jubler/files/jubler-4.6.1-gentoo.patch delete mode 100644 media-video/jubler/jubler-4.6.1-r3.ebuild (limited to 'media-video/jubler') diff --git a/media-video/jubler/Manifest b/media-video/jubler/Manifest index 2cc998ebf042..918267376786 100644 --- a/media-video/jubler/Manifest +++ b/media-video/jubler/Manifest @@ -1,9 +1,4 @@ -AUX jubler-4.6.1-ffmpeg-1.patch 14239 BLAKE2B 4562145ffb0f9e1f417acab7d0e3de47bf84230366c4ee05ebd6557d195ba138de03062b3400e6aaca8a4d32ddf30e487690611973b38dcf2430da39adde1a85 SHA512 c20848a23dfea2e023e041af8c5a249aa0f7399cb21012a997fcbc864691599f817eb1fa5b58fd0b8494ad936119a1366cbb75cac940e2e45b6edb13d35f4c69 -AUX jubler-4.6.1-ffmpeg-2.patch 1846 BLAKE2B c97f66a0624f49a79fa08c89674c15389cd0fe77ae7f83e1adf59be375a779f2fef79f81873c4a7c5ec5c6aaae50a63f71a572a4bd10f8a09b495ddb4d3515db SHA512 c5c3d6749c6860a91de1f9901c23590803782a69530534fd3635a385e21c0d1d493f43821e26d10491199b86682719fd3d4b0603641812b741714eda0c795d10 -AUX jubler-4.6.1-gentoo.patch 7061 BLAKE2B 2a3128e115c09264b86bdd4160de8d4799f1904f786c3d14f128bc41d2df84eafea1ee67b28ca505441b9ab73c0e687ed5513f3d0e9ff999ef9b1fbd827eb6bc SHA512 d7d50774c3f3f6780bce455d6e0b2765d14588b3545a913b8f8adedb947877115fcae788eb1d3fed322fac472ae33362c53e36808a3f276b60926e183bab8e0d AUX update-4.6.1.xml 20433 BLAKE2B 47c995796107adf2eef200ae7c40958270b5f41be029c40fe17b0e67d52adff929f9df766c0027ca8901eb31163bf8d5eff705affb49ae4f610e4f268492f7ad SHA512 f50876c78c25f7fc5c20511911427713a11f7063055fc3d3ad0a77b6416af7385108a5426e9c75e773fcbe329cb8a12e580b350bac86442f03a50a7d517306e4 -DIST Jubler-source-4.6.1.tar.bz2 1971701 BLAKE2B 055b15eae2ae2bc1f5529823592ca2a61936d256a7635d51ea925711c8a456400c47d528cb9d4145dea64faf3b860869d63a7c712c281d81ea8a388f9f625860 SHA512 629aef58f98d2d8569a58a4c68c9bf440cd4693ca8847a0b8ad9e84458cd88de44542b5fc84e25033c1e22b26a4d675e070c5a58203a6bbe671072e5cdc2680a DIST jubler-5.1.tar.bz2 1815531 BLAKE2B 59f9c3c57b906a73e16b32841900ef16450758115d930e767bc4d63882ad2b8a35100a34057ab6bb353f4bea87cb4036e080d8d13a844ae4bfcae8bb361d5b18 SHA512 e2a0da737362a3c8dc12966aec1e9939291237fc714a586186b72daa16abf967c8fea8dac04fb191cb803aa11db20cf6d67468d2383f17f5c6114a643860acef -EBUILD jubler-4.6.1-r3.ebuild 3029 BLAKE2B 5ce9538583db5962bc177b43c5afe37f2eda3ed390962df2849fc28c8a9f29aad65ef1bd9931229a45942d1b9a89c97a8b0b659d4a785b9a00543d0b4bf15216 SHA512 03dfd15739806037ed90c4c92400c87eca9ae382553be794fcff5464ecb185b9184b3dbbb9ecaef8a0eafe3018591619d2b0beff6bbfe06ebef0487ace847e65 -EBUILD jubler-5.1.ebuild 1714 BLAKE2B 902a0b4b1f2d2e4e332443702915b6f6342474ebe37c640e3fdb0da5c6915b752a93c6dba9c128bca5b1d9a9672b8cf62736d3abd015bc788c9d59079a8465aa SHA512 a33595f4312901c38d5a4b7400e0fe72824408323c4914857cc12f3b61409fdd1bebed59cf9f225e951b9a14f35e1a3f6136611fc73543419764126875b03784 +EBUILD jubler-5.1.ebuild 1713 BLAKE2B b7d2d4f1064b797e107f372d0949bc9de829e9fbae7f5d9d28976b7f0068cc3c31054cf084228024e41e79228dab05eadf12f0f090ee9dc4e041871d2a46d29a SHA512 1c372639fde50e4cf4dd7a4025a45f972941cc138a60f489cec88e545b234e5dd1fe433a87acde8117dad613c3a68df74aed64bd822015cfd569cf34d666d6f6 MISC metadata.xml 292 BLAKE2B 9d8724a93d3fe4fb781615a11ad6e90963fcedcead3075387baf4dafb9dde7e31f0e2ade52adfdae19122d3a24682c4f58a9630c676ba040813569ca41c41b74 SHA512 c7131847c06b95cec1212b3ead2a170abc2a5eeae13d6e7db0683370c7e8949e6ebbcffd320f54c3bf26cf50b88cdd44bc02a7e315e7a943407a68c8747c4031 diff --git a/media-video/jubler/files/jubler-4.6.1-ffmpeg-1.patch b/media-video/jubler/files/jubler-4.6.1-ffmpeg-1.patch deleted file mode 100644 index 18df9069d198..000000000000 --- a/media-video/jubler/files/jubler-4.6.1-ffmpeg-1.patch +++ /dev/null @@ -1,274 +0,0 @@ -Index: Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c -=================================================================== ---- Jubler-4.6.1.orig/resources/ffmpeg/ffdecode/decodeaudio.c -+++ Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c -@@ -67,19 +67,19 @@ jboolean decodeAudio(JNIEnv * env, jobje - AVStream *audio_st=NULL; - int got_audio, len, err=0, audio_index=-1, i=0, pack_duration=0, packsize=0, codec_is_open=-1, video_index=-1, codec_enc_is_open=-1; - jlong pack_pts=0; -- char *outbuf=NULL; -+ AVFrame *outbuf=NULL; - unsigned char *packptr; - jboolean ret = JNI_TRUE, nobrk = JNI_TRUE; - - av_register_all(); - - /* Open the input/output files */ -- err = av_open_input_file(&fcx, input_filename, NULL, 0, NULL); -+ err = avformat_open_input(&fcx, input_filename, NULL, NULL); - if(err<0){ - DEBUG(env, this, "decodeAudio", "Could not open file '%s'.", input_filename); - ret = JNI_FALSE; - } -- outbuf = malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE); -+ outbuf = avcodec_alloc_frame(); - if(outbuf==NULL) { - DEBUG(env, this, "decodeAudio", "Could not allocate memory for outbuf."); - ret = JNI_FALSE; -@@ -129,7 +129,7 @@ jboolean decodeAudio(JNIEnv * env, jobje - } - else { - /* open it */ -- if ((codec_is_open = avcodec_open(ccx, codec)) < 0) { -+ if ((codec_is_open = avcodec_open2(ccx, codec, NULL)) < 0) { - DEBUG(env, this, "decodeAudio", "Could not open codec."); - ret = JNI_FALSE; - } -@@ -158,10 +158,10 @@ jboolean decodeAudio(JNIEnv * env, jobje - } - - /* use wav as the output format of the file */ -- fmt = guess_format(NULL, output_filename, NULL); -+ fmt = av_guess_format(NULL, output_filename, NULL); - if (!fmt) { - DEBUG(env, this, "decodeAudio", "Could not deduce output format from file extension: using WAV."); -- fmt = guess_format("wav", NULL, NULL); -+ fmt = av_guess_format("wav", NULL, NULL); - } - if (!fmt) { - DEBUG(env, this, "decodeAudio", "Could not find suitable output format."); -@@ -182,35 +182,28 @@ jboolean decodeAudio(JNIEnv * env, jobje - audio_st = add_audio_stream(env, this, ofcx, fmt->audio_codec, ccx->sample_rate, ccx->channels); - } - -- /* set the output parameters (must be done even if no parameters) */ -- if (av_set_parameters(ofcx, NULL) < 0) { -- DEBUG(env, this, "decodeAudio", "Invalid output format parameters."); -- ret = JNI_FALSE; -- } -- else { - codec_enc = avcodec_find_encoder(audio_st->codec->codec_id); - if (!codec_enc) { - DEBUG(env, this, "decodeAudio", "Encoder codec not found."); - ret = JNI_FALSE; - } - else { -- if ((codec_enc_is_open = avcodec_open(audio_st->codec, codec_enc)) < 0) { -+ if ((codec_enc_is_open = avcodec_open2(audio_st->codec, codec_enc, NULL)) < 0) { - DEBUG(env, this, "decodeAudio", "Could not open encoder codec."); - ret = JNI_FALSE; - } - else { - if (!(fmt->flags & AVFMT_NOFILE)) { -- if (url_fopen(&ofcx->pb, output_filename, URL_WRONLY) < 0) { -+ if (avio_open(&ofcx->pb, output_filename, AVIO_FLAG_WRITE) < 0) { - DEBUG(env, this, "decodeAudio", "Could not open file '%s'", output_filename); - ret = JNI_FALSE; - } - else { -- av_write_header(ofcx); -+ avformat_write_header(ofcx,NULL); - } - } - } - } -- } - } - } - else { -@@ -243,7 +236,7 @@ jboolean decodeAudio(JNIEnv * env, jobje - ccx->request_channels = 2; - } - got_audio = AVCODEC_MAX_AUDIO_FRAME_SIZE; -- len = avcodec_decode_audio2(ccx, (short *)outbuf, &got_audio, packptr, packsize); -+ len = avcodec_decode_audio4(ccx, outbuf, &got_audio, &pkt); - - if (len < 0) { - DEBUG(env, this, "decodeAudio", "Error while decoding."); -@@ -258,7 +251,7 @@ jboolean decodeAudio(JNIEnv * env, jobje - * this is the frame we want */ - if (pack_pts >= seek_time_start) { - /* if a frame has been decoded, output it */ -- audio_enc_out(env, this, ofcx, audio_st, (short *)outbuf, got_audio); -+ audio_enc_out(env, this, ofcx, audio_st, (short *)(outbuf->data[0]), av_samples_get_buffer_size(NULL, ccx->channels, outbuf->nb_samples, ccx->sample_fmt, 1)); - /* if the next frame gets past our stop time, we want to stop decoding */ - if ( pack_pts + pack_duration > seek_time_stop ) { - av_free_packet(&pkt); -@@ -269,7 +262,7 @@ jboolean decodeAudio(JNIEnv * env, jobje - /* If the next frame will be past our start seek time, this is the frame we want */ - else if (pack_pts + pack_duration > seek_time_start) { - /* if a frame has been decoded, output it */ -- audio_enc_out(env, this, ofcx, audio_st, (short *)outbuf, got_audio); -+ audio_enc_out(env, this, ofcx, audio_st, (short *)(outbuf->data[0]), av_samples_get_buffer_size(NULL, ccx->channels, outbuf->nb_samples, ccx->sample_fmt, 1)); - /* if the next frame gets past our stop time, we want to stop decoding */ - if ( pack_pts + pack_duration > seek_time_stop ) { - av_free_packet(&pkt); -@@ -301,7 +294,7 @@ jboolean decodeAudio(JNIEnv * env, jobje - - /* close the output file */ - if (!(fmt->flags & AVFMT_NOFILE) && ofcx->pb != NULL) { -- url_fclose(ofcx->pb); -+ avio_close(ofcx->pb); - } - - /* free the stream */ -@@ -309,7 +302,7 @@ jboolean decodeAudio(JNIEnv * env, jobje - } - - if(codec_is_open >= 0) avcodec_close(ccx); -- if(outbuf != NULL) free(outbuf); -+ if(outbuf != NULL) av_free(outbuf); - if(fcx != NULL) av_close_input_file(fcx); - - return ret; -Index: Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeframe.c -=================================================================== ---- Jubler-4.6.1.orig/resources/ffmpeg/ffdecode/decodeframe.c -+++ Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeframe.c -@@ -122,7 +122,7 @@ AVPicture* decodeFrame(JNIEnv * env, job - AVFrame *frame=avcodec_alloc_frame(); - - /* Open the input file */ -- err = av_open_input_file(&fcx, input_filename, NULL, 0, NULL); -+ err = avformat_open_input(&fcx, input_filename, NULL, NULL); - if(err<0){ - DEBUG(env, this, "decodeFrame", "Could not open file '%s'.", input_filename); - retflag = FALSE; -@@ -157,7 +157,7 @@ AVPicture* decodeFrame(JNIEnv * env, job - } - else { - // Open codec -- if((codec_is_open = avcodec_open(ccx, codec)) < 0 ) { -+ if((codec_is_open = avcodec_open2(ccx, codec, NULL)) < 0 ) { - DEBUG(env, this, "decodeFrame", "Could not open codec."); - retflag = FALSE; - } -@@ -190,7 +190,7 @@ AVPicture* decodeFrame(JNIEnv * env, job - pack_duration = av_rescale_q(pkt.duration, fcx->streams[video_index]->time_base, AV_TIME_BASE_Q); - comp_pts += pkt.duration; - // Decode this packet -- len = avcodec_decode_video(ccx, frame, &got_picture, pkt.data, pkt.size); -+ len = avcodec_decode_video2(ccx, frame, &got_picture, &pkt); - if (len < 0) { - DEBUG(env, this, "decodeFrame", "Error while decoding."); - retflag = FALSE; -@@ -265,7 +265,7 @@ int file_info(JNIEnv * env, jobject this - av_register_all(); - - // Open the input file. -- err = av_open_input_file(&fcx, input_filename, NULL, 0, NULL); -+ err = avformat_open_input(&fcx, input_filename, NULL, NULL); - if(err<0){ - DEBUG(env, this, "file_info", "Could not open file '%s'.", input_filename); - return 1; -@@ -275,9 +275,9 @@ int file_info(JNIEnv * env, jobject this - err = av_find_stream_info(fcx); - - // Give us information about the file and exit -- dump_format(fcx, 0, input_filename, FALSE); -+ av_dump_format(fcx, 0, input_filename, FALSE); - -- av_close_input_file(fcx); -+ avformat_close_input(&fcx); - return 0; - } - -Index: Jubler-4.6.1/resources/ffmpeg/ffdecode/grabinfo.c -=================================================================== ---- Jubler-4.6.1.orig/resources/ffmpeg/ffdecode/grabinfo.c -+++ Jubler-4.6.1/resources/ffmpeg/ffdecode/grabinfo.c -@@ -82,7 +82,7 @@ void get_information(JNIEnv * env, jobje - av_register_all(); - - // Open the input file. -- err = av_open_input_file(&fcx, video_c, NULL, 0, NULL); -+ err = avformat_open_input(&fcx, video_c, NULL, NULL); - if(err<0) { - DEBUG(env, this, "get_information", "Could not open file '%s'.", video_c); - ret = JNI_FALSE; -Index: Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c -=================================================================== ---- Jubler-4.6.1.orig/resources/ffmpeg/ffdecode/makecache.c -+++ Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c -@@ -59,7 +59,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana - float ratewindow = 0; - unsigned int offset=0, maxbyte=0, sampledcounter=1; - FILE *cachefile=NULL; -- uint8_t *outbuf=NULL; -+ AVFrame *outbuf=NULL; - jboolean nobrk = JNI_TRUE; - - int ENDIANESS = isLittleEndian(); -@@ -81,7 +81,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana - ret = JNI_TRUE; - - // Open the input file. -- err = av_open_input_file(&fcx, audio_c, NULL, 0, NULL); -+ err = avformat_open_input(&fcx, audio_c, NULL, NULL); - cachefile = fopen(cache_c, "wb"); - if(err<0){ - DEBUG(env, this, "makeCache", "Could not open audio file '%s'.", audio_c); -@@ -91,7 +91,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana - DEBUG(env, this, "makeCache", "Could not open cache file '%s'.", cache_c); - ret = JNI_FALSE; - } -- outbuf = malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE); -+ outbuf = avcodec_alloc_frame(); - if(outbuf==NULL) { - DEBUG(env, this, "makeCache", "Could not allocate memory for outbuf."); - ret = JNI_FALSE; -@@ -123,7 +123,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana - } - else { - /* open it */ -- if ((codec_is_open = avcodec_open(ccx, codec)) < 0) { -+ if ((codec_is_open = avcodec_open2(ccx, codec,NULL)) < 0) { - DEBUG(env, this, "makeCache", "Could not open codec."); - ret = JNI_FALSE; - } -@@ -175,7 +175,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana - pack_pts = av_rescale_q(pkt.pts, fcx->streams[audio_index]->time_base, AV_TIME_BASE_Q); - // Decode the paket - got_audio = AVCODEC_MAX_AUDIO_FRAME_SIZE; -- len = avcodec_decode_audio2(ccx, (short *)outbuf, &got_audio, pkt.data, pkt.size); -+ len = avcodec_decode_audio4(ccx, outbuf, &got_audio, &pkt); - - if (len < 0) { - DEBUG(env, this, "makeCache", "Error while decoding."); -@@ -196,7 +196,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana - if (bytecounter+offset + step*channels >= maxbyte) { - for (j = 1; j <= channels ; j++) { - // actually sample is not the whole sample, but the data for one channel each time -- sample = (char)outbuf[bytecounter+ENDIANESS]; -+ sample = (char)outbuf->data[0][bytecounter+ENDIANESS]; - // min max averaging: only keep the highest and the lowest sample value - if (maxsample[j-1] < sample) maxsample[j-1] = sample; - if (minsample[j-1] > sample) minsample[j-1] = sample; -@@ -215,7 +215,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana - } - else { - for (j = 1; j <= channels; j++) { -- sample = (char)outbuf[bytecounter+ENDIANESS]; -+ sample = (char)outbuf->data[0][bytecounter+ENDIANESS]; - // min max averaging - if (maxsample[j-1] < sample) maxsample[j-1] = sample; - if (minsample[j-1] > sample) minsample[j-1] = sample; -@@ -254,7 +254,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana - if(minsample != NULL) free(minsample); - if(cachefile != NULL) fclose(cachefile); - if(codec_is_open >= 0) avcodec_close(ccx); -- if(outbuf != NULL) free(outbuf); -+ if(outbuf != NULL) av_free(outbuf); - if(fcx != NULL) av_close_input_file(fcx); - - return ret; diff --git a/media-video/jubler/files/jubler-4.6.1-ffmpeg-2.patch b/media-video/jubler/files/jubler-4.6.1-ffmpeg-2.patch deleted file mode 100644 index 28f50b57d6ad..000000000000 --- a/media-video/jubler/files/jubler-4.6.1-ffmpeg-2.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c b/Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c -index 92bf071..d163010 100644 ---- a/Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c -+++ b/Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c -@@ -37,6 +37,13 @@ jboolean decodeAudio(JNIEnv* env, jobject this, const char *input_filename, cons - AVStream *add_audio_stream(JNIEnv* env, jobject this, AVFormatContext *oc, int codec_id, int sample_rate, int channels); - void audio_enc_out(JNIEnv * env, jobject this, AVFormatContext *ofcx, AVStream *audio_st, const short *samples, int buf_size); - -+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE -+#ifndef MAX_AUDIO_FRAME_SIZE -+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio -+#else -+#define AVCODEC_MAX_AUDIO_FRAME_SIZE MAX_AUDIO_FRAME_SIZE -+#endif -+#endif - - JNIEXPORT jboolean JNICALL Java_com_panayotis_jubler_media_preview_decoders_FFMPEG_createClip(JNIEnv * env, jobject this, jstring audio, jstring wav, jlong start, jlong stop) { - const char * audio_c; -diff --git a/Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c b/Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c -index d7ea88b..0190b79 100644 ---- a/Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c -+++ b/Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c -@@ -38,6 +38,14 @@ - #include "defaults.h" - #include "utilities.h" - -+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE -+#ifndef MAX_AUDIO_FRAME_SIZE -+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio -+#else -+#define AVCODEC_MAX_AUDIO_FRAME_SIZE MAX_AUDIO_FRAME_SIZE -+#endif -+#endif -+ - JNIEXPORT jboolean JNICALL Java_com_panayotis_jubler_media_preview_decoders_NativeDecoder_makeCache(JNIEnv * env, jobject this, jstring audio, jstring cache, jstring original) { - const char *audio_c; - const char *cache_c; diff --git a/media-video/jubler/files/jubler-4.6.1-gentoo.patch b/media-video/jubler/files/jubler-4.6.1-gentoo.patch deleted file mode 100644 index 25afdba2fcc9..000000000000 --- a/media-video/jubler/files/jubler-4.6.1-gentoo.patch +++ /dev/null @@ -1,163 +0,0 @@ -diff -Nur Jubler-4.6.1/build.xml Jubler-4.6.1_patched/build.xml ---- Jubler-4.6.1/build.xml 2011-02-05 23:46:03.000000000 +0200 -+++ Jubler-4.6.1_patched/build.xml 2011-02-13 14:46:56.562977001 +0200 -@@ -1,36 +1,9 @@ - -- -+ - Builds, tests, and runs the project Jubler. - -- -- -- -- -- -- -+ - -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -@@ -45,12 +18,14 @@ - - - -- -+ -+ -+ - - - -- -- -+ -+ - - - -@@ -311,7 +286,7 @@ - - - -- -+ - - - -@@ -337,7 +312,7 @@ - - - -- -+ - - - -diff -Nur Jubler-4.6.1/core/src/com/panayotis/jubler/information/HelpBrowser.java Jubler-4.6.1_patched/core/src/com/panayotis/jubler/information/HelpBrowser.java ---- Jubler-4.6.1/core/src/com/panayotis/jubler/information/HelpBrowser.java 2011-01-31 01:19:02.000000000 +0200 -+++ Jubler-4.6.1_patched/core/src/com/panayotis/jubler/information/HelpBrowser.java 2011-02-12 14:38:50.220780001 +0200 -@@ -47,7 +47,7 @@ - - history = new ArrayList(); - -- String initpage = "file:" + SystemFileFinder.getJublerAppPath() + "/help/jubler-faq.html"; -+ String initpage = "file:" + SystemFileFinder.getJublerAppPath() + "/../help/jubler-faq.html"; - setPage(initpage); - history.add(initpage); - -diff -Nur Jubler-4.6.1/core/src/com/panayotis/jubler/os/SystemDependent.java Jubler-4.6.1_patched/core/src/com/panayotis/jubler/os/SystemDependent.java ---- Jubler-4.6.1/core/src/com/panayotis/jubler/os/SystemDependent.java 2011-01-31 01:19:02.000000000 +0200 -+++ Jubler-4.6.1_patched/core/src/com/panayotis/jubler/os/SystemDependent.java 2011-02-12 14:43:25.740780001 +0200 -@@ -182,7 +182,7 @@ - Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + url); - else { //assume Unix or Linux - String[] browsers = { -- "firefox", "konqueror", "opera", "epiphany", "mozilla", "netscape"}; -+ "xdg-open", "firefox", "konqueror", "opera", "epiphany", "mozilla", "netscape"}; - String browser = null; - for (int count = 0; count < browsers.length && browser == null; count++) - if (Runtime.getRuntime().exec( -diff -Nur Jubler-4.6.1/core/src/com/panayotis/jubler/os/SystemFileFinder.java Jubler-4.6.1_patched/core/src/com/panayotis/jubler/os/SystemFileFinder.java ---- Jubler-4.6.1/core/src/com/panayotis/jubler/os/SystemFileFinder.java 2011-02-05 01:59:45.000000000 +0200 -+++ Jubler-4.6.1_patched/core/src/com/panayotis/jubler/os/SystemFileFinder.java 2011-02-12 14:38:18.520780001 +0200 -@@ -56,9 +56,8 @@ - - public static boolean loadLibrary(String name) { - File libfile = findFile("lib" + FileCommunicator.FS + System.mapLibraryName(name)); -- if (libfile != null) - try { -- System.load(libfile.getAbsolutePath()); -+ System.loadLibrary(name); - return true; - } catch (UnsatisfiedLinkError e) { - DEBUG.debug(e); -diff -Nur Jubler-4.6.1/resources/ffmpeg/ffdecode/Makefile Jubler-4.6.1_patched/resources/ffmpeg/ffdecode/Makefile ---- Jubler-4.6.1/resources/ffmpeg/ffdecode/Makefile 2011-01-31 16:26:26.000000000 +0200 -+++ Jubler-4.6.1_patched/resources/ffmpeg/ffdecode/Makefile 2011-02-15 20:26:34.213149001 +0200 -@@ -12,9 +12,6 @@ - # Name of the produced library - PROJ=ffdecode - --# Paths of include files --JAVA_HOME=${shell /bin/sh ../../system/findjava.sh -j} -- - # Current Path - CPATH=${shell pwd} - -@@ -42,7 +39,6 @@ - # Various options - FFCONF=configure - LIBSUF=_${SYSTEM}.${ARCH} --MAKEOPTS=-j3 - - # Find requested files - NATIVES=${shell cd ../../src && grep -r ' native ' * | grep -v '/.svn/' | gawk -F ':' '{print $$1}' | uniq | sed -e 's/\.java$$//g' | tr '/' '.' } -@@ -136,7 +132,6 @@ - CCPREF_NOS=${shell echo ${CCPREF} | sed -e 's/-$$//g' } - DCONFIG=--with-mp4v2 --host=${CCPREF_NOS} - --CC=${CCPREF}gcc - RANLIB=${CCPREF}ranlib - - ifeq (${NOSTRIP},) -@@ -151,7 +146,7 @@ - .SUFFIXES:.o .c - - .c.o: -- ${CC} ${CFLAGS} ${GCCOPTS} -std=c99 -pedantic -O3 -Wall ${INCS} ${JINCLUDE} -c -o $@ $? -+ ${CC} ${CFLAGS} ${GCCOPTS} -std=c99 -pedantic -Wall ${INCS} ${JINCLUDE} -c -o $@ $? - - - develop:javacheck -@@ -208,7 +203,7 @@ - LIB:${LIBNAME} - - ${LIBNAME}:${LIBRARYREQ} ${OBJS} ${RANLIBREQ} -- ${LD} ${GCCOPTS} -o ${LIBNAME} ${OBJS} ${LIBS} -+ ${LD} ${LDFLAGS} ${GCCOPTS} -o ${LIBNAME} ${OBJS} ${LIBS} - ${STRIPCMD} ${LIBNAME} - - diff --git a/media-video/jubler/jubler-4.6.1-r3.ebuild b/media-video/jubler/jubler-4.6.1-r3.ebuild deleted file mode 100644 index c8541a6b8181..000000000000 --- a/media-video/jubler/jubler-4.6.1-r3.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="2" -WANT_ANT_TASKS="ant-nodeps ant-contrib" -inherit fdo-mime eutils java-pkg-2 java-ant-2 toolchain-funcs - -MY_PN=${PN/#j/J} -DESCRIPTION="Java subtitle editor" -HOMEPAGE="http://www.jubler.org/" -SRC_URI="https://${PN}.googlecode.com/files/${MY_PN}-source-${PV}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="mplayer nls spell" - -RDEPEND=">=virtual/jre-1.5 - virtual/ffmpeg - mplayer? ( media-video/mplayer[libass] ) - spell? ( - app-text/aspell - >=dev-java/zemberek-2.0[l10n_tr] - )" - -DEPEND=">=virtual/jdk-1.5 - virtual/ffmpeg - app-text/xmlto - >=dev-java/jupidator-0.6.0 - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -S=${WORKDIR}/${MY_PN}-${PV} - -src_unpack() { - unpack ${A} - cp "${FILESDIR}"/update-${PV}.xml "${S}" || die -} - -java_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch - epatch "${FILESDIR}"/${P}-ffmpeg-1.patch - epatch "${FILESDIR}"/${P}-ffmpeg-2.patch - chmod +x resources/installers/linux/iconinstall - #cd resources/libs || die - java-pkg_jarfrom --build-only --into resources/libs jupidator - rm -R plugins/{autoupdate,macapp} || die "unneeded plugin cleanup failed" - rm -R resources/libs/ant-contrib || die "jar cleanup failed" - if ! use mplayer; then - rm -R plugins/mplayer || die "mplayer plugin removal failed" - fi - if ! use spell; then - rm -R plugins/{zemberek,aspell} || die "spellcheck plugin removal failed" - fi - sed -i -e "s/CODEC_TYPE/AVMEDIA_TYPE/g" $(find resources/ffmpeg/ffdecode -name "*.c") - sed -i -e "s:PKT_FLAG_KEY:AV_PKT_FLAG_KEY:g" $(find resources/ffmpeg/ffdecode -name "*.c") -} - -src_compile() { - java-pkg_filter-compiler ecj-3.2 - ANT_TASKS="ant-nodeps ant-contrib" eant $(use nls && echo allparts) $(use nls || echo parts) help changelog || die "eant failed" - #cp -v dist/help/jubler-faq.html build/classes/help || die "cp failed" - cd resources/ffmpeg/ffdecode || die - CC=$(tc-getCC) NOSTRIP=true emake linuxdyn || die "make failed" -} - -src_install() { - java-pkg_dojar dist/Jubler.jar - use nls && java-pkg_dojar dist/i18n/*.jar - insinto /usr/share/jubler/lib/lib - doins dist/lib/*.jar || die "Plugin installation failed" - #java-pkg_dojar dist/lib/*.jar - use spell && java-pkg_register-dependency zemberek zemberek2-cekirdek.jar - use spell && java-pkg_register-dependency zemberek zemberek2-tr.jar - java-pkg_doso resources/ffmpeg/ffdecode/libffdecode.so - doicon resources/installers/linux/jubler.png - domenu resources/installers/linux/jubler.desktop - - DESTDIR="${D}" eant linuxdesktopintegration - rm -vr "${D}/usr/share/menu" || die - - java-pkg_dolauncher jubler --main Jubler - dohtml ChangeLog.html || die "dohtml failed" - dodoc README || die "dodoc failed" - doman resources/installers/linux/jubler.1 || die "doman failed" - insinto /usr/share/jubler/help - doins dist/help/* || die "doins failed" -} - -pkg_postinst() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update -} diff --git a/media-video/jubler/jubler-5.1.ebuild b/media-video/jubler/jubler-5.1.ebuild index 18165e1abb2e..7b4baee2da7f 100644 --- a/media-video/jubler/jubler-5.1.ebuild +++ b/media-video/jubler/jubler-5.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-source-${PV}.tar.bz2 -> ${P}.tar.bz LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="mplayer spell nls" RDEPEND=" -- cgit v1.2.3