[svn] r5463 - trunk/rpms/transcode

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Thu May 31 14:58:14 CEST 2007


Author: thias
Date: 2007-05-31 14:58:12 +0200 (Thu, 31 May 2007)
New Revision: 5463

Added:
   trunk/rpms/transcode/transcode-1.0.3-lzo2.patch
Removed:
   trunk/rpms/transcode/transcode-1.0.2-filter_compare-fixes-try1.patch
   trunk/rpms/transcode/transcode-1.0.2-filter_logo-hangup-try1.patch
   trunk/rpms/transcode/transcode-1.0.2-libavcodec.patch
   trunk/rpms/transcode/transcode-1.0.2-lzo2.patch
   trunk/rpms/transcode/transcode-1.0.x-filter-patch.txt
Modified:
   trunk/rpms/transcode/transcode.spec
Log:
Update transcode to 1.0.3.


Deleted: trunk/rpms/transcode/transcode-1.0.2-filter_compare-fixes-try1.patch
===================================================================
--- trunk/rpms/transcode/transcode-1.0.2-filter_compare-fixes-try1.patch	2007-05-31 12:11:34 UTC (rev 5462)
+++ trunk/rpms/transcode/transcode-1.0.2-filter_compare-fixes-try1.patch	2007-05-31 12:58:12 UTC (rev 5463)
@@ -1,144 +0,0 @@
---- filter/filter_compare.c.old	2006-01-24 17:25:53.000000000 +0100
-+++ filter/filter_compare.c	2006-01-24 17:46:39.000000000 +0100
-@@ -23,7 +23,7 @@
-  */
- 
- #define MOD_NAME    "filter_compare.so"
--#define MOD_VERSION "v0.1.2 (2003-08-29)"
-+#define MOD_VERSION "v0.1.3 (2006-01-24)"
- #define MOD_CAP     "compare with other image to find a pattern"
- #define MOD_AUTHOR  "Antonio Beamud"
- 
-@@ -97,6 +97,8 @@
- 	
- }
- 
-+#define RESULTS_FILE    "/tmp/compare.dat"
-+#define PATTERN_FILE    "/dev/null"
- 
- int tc_filter(vframe_list_t *ptr, char *options)
- {
-@@ -114,9 +116,9 @@
- 		optstr_filter_desc(options, MOD_NAME, MOD_CAP, MOD_VERSION,
- 				   MOD_AUTHOR, "VRYMO", "1");
- 		
--		snprintf(buf, 128, "/dev/null");
-+        snprintf(buf, 128, PATTERN_FILE);
- 		optstr_param(options, "pattern", "Pattern image file path", "%s", buf);
--		snprintf(buf, 128, "results.dat");
-+        snprintf(buf, 128, RESULTS_FILE);
- 		optstr_param(options, "results", "Results file path" , "%s", buf);
- 		snprintf(buf, 128, "%f", compare[instance]->delta);
- 		optstr_param(options, "delta", "Delta error", "%f",buf,"0.0", "100.0");
-@@ -132,16 +134,20 @@
- 
- 	if(ptr->tag & TC_FILTER_INIT) 
- 	{
--
-+        char pattern_name[PATH_MAX];
-+        char results_name[PATH_MAX];
- 		unsigned int t,r,index;
- 		pixelsMask *temp;
- 
--		if((compare[instance] = (compareData *)malloc(sizeof(compareData))) == NULL)
-+        /* defaults */
-+        strlcpy(results_name, RESULTS_FILE, sizeof(results_name));
-+        strlcpy(pattern_name, PATTERN_FILE, sizeof(pattern_name));
-+        
-+        if((compare[instance] = malloc(sizeof(compareData))) == NULL)
- 			return (-1);
- 		
- 		if((compare[instance]->vob = tc_get_vob())==NULL) return(-1);
- 		
--
- 		compare[instance]->delta=DELTA_COLOR;
- 		compare[instance]->step=1;
- 		compare[instance]->width=0;
-@@ -154,13 +160,13 @@
- 		compare[instance]->height = compare[instance]->vob->ex_v_height;
- 
- 		if (options != NULL) {
--			char pattern_name[PATH_MAX];
--			char results_name[PATH_MAX];
--			memset(pattern_name,0,PATH_MAX);
--			memset(results_name,0,PATH_MAX);
--
- 			if(verbose) printf("[%s] options=%s\n", MOD_NAME, options);
- 	
-+            if (optstr_lookup (options, "help")) {
-+                help_optstr();
-+                return(0);
-+            }
-+            
- 			optstr_get(options, "pattern", "%[^:]", &pattern_name);
- 			optstr_get(options, "results", "%[^:]", &results_name);
- 			optstr_get(options, "delta", "%f", &compare[instance]->delta);
-@@ -172,47 +178,45 @@
- 			printf("        delta = %f\n", compare[instance]->delta);
- 			}		
- 			
--			if (strlen(results_name) == 0) {
--				// Ponemos el nombre del fichero al original con extension dat
--				strlcpy(results_name, "/tmp/compare.dat", sizeof(results_name));
--				
-+            if (!pattern_name || !strlen(pattern_name)) {
-+                /* restore default */
-+                fprintf(stderr, "[%s] missing image file, using fake "
-+                                "source\n", MOD_NAME);
-+                strlcpy(pattern_name, PATTERN_FILE, sizeof(pattern_name));
- 			}
--			if (!(compare[instance]->results = fopen(results_name, "w")))
--			{
-+            if (!results_name || !strlen(results_name)) {
-+                /* restore default */
-+                fprintf(stderr, "[%s] using default results file '%s'\n",
-+                                MOD_NAME, RESULTS_FILE);
-+                strlcpy(results_name, RESULTS_FILE, sizeof(results_name));
-+            }
-+        }
-+            
-+        if (!(compare[instance]->results = fopen(results_name, "w"))) {
- 				perror("could not open file for writing");
-+            return(-1);
- 			}
- 			
- 			InitializeMagick("");
- 			if (verbose > 1) printf("[%s] Magick Initialized successfully\n", MOD_NAME);
- 				
- 			GetExceptionInfo(&exception_info);
--			image_info = CloneImageInfo ((ImageInfo *) NULL);
-+        image_info = CloneImageInfo(NULL);
- 			strlcpy(image_info->filename, pattern_name, MaxTextExtent);
- 			if (verbose > 1)
- 			     printf("Trying to open image\n");
--			orig = ReadImage(image_info,
--					 &exception_info);
-+        orig = ReadImage(image_info, &exception_info);
- 			
--			if (orig == (Image *) NULL) {
-+        if (!orig) {
- 				MagickWarning(exception_info.severity,
- 					      exception_info.reason,
- 					      exception_info.description);
--				strlcpy(pattern_name, "/dev/null", sizeof(pattern_name));
--			}else{
-+                fprintf(stderr, "[%s] Can't open image\n", MOD_NAME);
-+                return(-1);
-+        } else {
- 			       if (verbose > 1)
- 			       		printf("[%s] Image loaded successfully\n", MOD_NAME);
- 			     }
--		}
--		
--		else{
--			perror("Not image provided");
--		}
-- 		
--		if (options != NULL)
--			if (optstr_lookup (options, "help")) {
--				help_optstr();
--			}
--		
- 		
- 		fprintf(compare[instance]->results,"#fps:%f\n",compare[instance]->vob->fps);
- 		

Deleted: trunk/rpms/transcode/transcode-1.0.2-filter_logo-hangup-try1.patch
===================================================================
--- trunk/rpms/transcode/transcode-1.0.2-filter_logo-hangup-try1.patch	2007-05-31 12:11:34 UTC (rev 5462)
+++ trunk/rpms/transcode/transcode-1.0.2-filter_logo-hangup-try1.patch	2007-05-31 12:58:12 UTC (rev 5463)
@@ -1,32 +0,0 @@
---- filter/filter_logo.c.old	2006-03-28 14:08:26.000000000 +0200
-+++ filter/filter_logo.c	2006-03-28 14:15:43.000000000 +0200
-@@ -146,6 +146,7 @@
-   }
- 
-   if(ptr->tag & TC_FILTER_INIT) {
-+    int dry_run = 0;
- 
-     if((vob = tc_get_vob())==NULL) return(-1);
- 
-@@ -181,8 +182,10 @@
- 	if (optstr_get (options, "rgbswap", "") >= 0) mfd->rgbswap=!mfd->rgbswap;
- 	if (optstr_get (options, "grayout", "") >= 0) mfd->grayout=!mfd->grayout;
- 
--	if (optstr_get (options, "help", "") >= 0)
-+	if (optstr_get (options, "help", "") >= 0) {
- 	    help_optstr();
-+	    dry_run = 1;
-+	}
-     }
- 
-     if (verbose > 1) {
-@@ -195,6 +198,9 @@
- 	printf ("       ignoredelay = %d\n", mfd->ignoredelay);
- 	printf ("           rgbswap = %d\n", mfd->rgbswap);
-     }
-+    if (dry_run) {
-+	return(0);
-+    }
- 
-     InitializeMagick("");
- 

Deleted: trunk/rpms/transcode/transcode-1.0.2-libavcodec.patch
===================================================================
--- trunk/rpms/transcode/transcode-1.0.2-libavcodec.patch	2007-05-31 12:11:34 UTC (rev 5462)
+++ trunk/rpms/transcode/transcode-1.0.2-libavcodec.patch	2007-05-31 12:58:12 UTC (rev 5463)
@@ -1,30 +0,0 @@
---- transcode-1.0.2.orig/configure	2005-11-06 07:04:59.000000000 +0100
-+++ transcode-1.0.2/configure	2005-11-06 07:04:59.000000000 +0100
-@@ -28107,7 +28107,12 @@ main()
-     printf("install ffmpeg 0.4.9-pre1 or newer, or a cvs version after 20040703");
-     return(1);
-   }
-+  /* 3344640 == ((51<<16)+(9<<8)+0) == 51.9.0 */
-+#ifdef LIBAVCODEC_BUILD >= 3344640
-+  printf("VER=%s\n", AV_STRINGIFY(LIBAVCODEC_VERSION));
-+#else
-   printf("VER=%s\n", FFMPEG_VERSION);
-+#endif /* LIBAVCODEC_BUILD >= 51.9.0 check */
-   printf("BUILD=%d\n", LIBAVCODEC_BUILD);
-   return(0);
- }
---- transcode-1.0.2.orig/configure.in	2005-10-30 05:57:45.000000000 +0100
-+++ transcode-1.0.2/configure.in	2005-10-30 05:57:45.000000000 +0100
-@@ -628,7 +628,12 @@ main()
-     printf("install ffmpeg 0.4.9-pre1 or newer, or a cvs version after 20040703");
-     return(1);
-   }
-+  /* 3344640 == ((51<<16)+(9<<8)+0) == 51.9.0 */
-+#ifdef LIBAVCODEC_BUILD >= 3344640
-+  printf("VER=%s\n", AV_STRINGIFY(LIBAVCODEC_VERSION));
-+#else
-   printf("VER=%s\n", FFMPEG_VERSION);
-+#endif /* LIBAVCODEC_BUILD >= 51.9.0 check */
-   printf("BUILD=%d\n", LIBAVCODEC_BUILD);
-   return(0);
- }

Deleted: trunk/rpms/transcode/transcode-1.0.2-lzo2.patch
===================================================================
--- trunk/rpms/transcode/transcode-1.0.2-lzo2.patch	2007-05-31 12:11:34 UTC (rev 5462)
+++ trunk/rpms/transcode/transcode-1.0.2-lzo2.patch	2007-05-31 12:58:12 UTC (rev 5463)
@@ -1,116 +0,0 @@
-diff -Naupr transcode-1.0.2.orig/configure transcode-1.0.2/configure
---- transcode-1.0.2.orig/configure	2005-11-06 07:04:59.000000000 +0100
-+++ transcode-1.0.2/configure	2006-07-31 13:16:19.000000000 +0200
-@@ -38069,7 +38069,7 @@ echo "${ECHO_T}default" >&6
-   for l in $lzo_ll ; do
-     case $l in
-       -L*) lpaths="$lpaths $l" ;;
--      -l*) test x"$l" != x"-llzo" && xlibs="$xlibs $l" ;;
-+      -l*) test x"$l" != x"-llzo2" && xlibs="$xlibs $l" ;;
-         *) xlf="$xlf $l" ;;
-     esac
-   done
-@@ -38085,13 +38085,13 @@ echo "${ECHO_T}default" >&6
-   if test x"lzo" != x"none" ; then
-     save_LDFLAGS="$LDFLAGS"
-     LDFLAGS="$LDFLAGS $lzo_ll"
--    echo "$as_me:$LINENO: checking for lzo_version in -llzo" >&5
--echo $ECHO_N "checking for lzo_version in -llzo... $ECHO_C" >&6
-+    echo "$as_me:$LINENO: checking for lzo_version in -llzo2" >&5
-+echo $ECHO_N "checking for lzo_version in -llzo2... $ECHO_C" >&6
- if test "${ac_cv_lib_lzo_lzo_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-llzo $LZO_EXTRA_LIBS $LIBS"
-+LIBS="-llzo2 $LZO_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -38150,7 +38150,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_lzo_lzo_version" >&5
- echo "${ECHO_T}$ac_cv_lib_lzo_lzo_version" >&6
- if test $ac_cv_lib_lzo_lzo_version = yes; then
--  LZO_LIBS="$lzo_ll -llzo $LZO_EXTRA_LIBS"
-+  LZO_LIBS="$lzo_ll -llzo2 $LZO_EXTRA_LIBS"
- else
- 
- tc_pkg_err="yes"
-diff -Naupr transcode-1.0.2.orig/configure.in transcode-1.0.2/configure.in
---- transcode-1.0.2.orig/configure.in	2005-10-30 05:57:45.000000000 +0100
-+++ transcode-1.0.2/configure.in	2006-07-31 13:14:12.000000000 +0200
-@@ -1018,7 +1018,7 @@ TC_PKG_HAVE(libquicktime, LIBQUICKTIME)
- dnl
- dnl LZO
- dnl
--TC_PKG_CHECK(lzo, no, LZO, no, [lzo1x.h], lzo, lzo_version, lzo,
-+TC_PKG_CHECK(lzo, no, LZO, no, [lzo1x.h], lzo2, lzo_version, lzo2,
-  [http://www.oberhumer.com/opensource/lzo/])
- TC_PKG_HAVE(lzo, LZO)
- 
-diff -Naupr transcode-1.0.2.orig/export/export_lzo.c transcode-1.0.2/export/export_lzo.c
---- transcode-1.0.2.orig/export/export_lzo.c	2005-07-04 09:09:31.000000000 +0200
-+++ transcode-1.0.2/export/export_lzo.c	2006-07-31 13:14:12.000000000 +0200
-@@ -84,8 +84,8 @@ MOD_init
- 	return(TC_EXPORT_ERROR); 
-       }
- 
--      wrkmem = (lzo_bytep) lzo_malloc(LZO1X_1_MEM_COMPRESS);
--      out = (lzo_bytep) lzo_malloc(vob->ex_v_height*vob->ex_v_width*3*2);
-+      wrkmem = (lzo_bytep) malloc(LZO1X_1_MEM_COMPRESS);
-+      out = (lzo_bytep) malloc(vob->ex_v_height*vob->ex_v_width*3*2);
- 
-       if (wrkmem == NULL || out == NULL) {
- 	printf("[%s] out of memory\n", MOD_NAME);
-@@ -270,8 +270,8 @@ MOD_stop 
-   
-   if(param->flag == TC_VIDEO) {
- 
--    lzo_free(wrkmem);
--    lzo_free(out);
-+    free(wrkmem);
-+    free(out);
-     
-     return(0);
-   }
-diff -Naupr transcode-1.0.2.orig/import/decode_lzo.c transcode-1.0.2/import/decode_lzo.c
---- transcode-1.0.2.orig/import/decode_lzo.c	2005-07-04 09:09:33.000000000 +0200
-+++ transcode-1.0.2/import/decode_lzo.c	2006-07-31 13:14:12.000000000 +0200
-@@ -65,9 +65,9 @@ void decode_lzo(decode_t *decode)
-       goto decoder_error;
-     }
- 
--    wrkmem = (lzo_bytep) lzo_malloc(LZO1X_1_MEM_COMPRESS);
--    out = (lzo_bytep) lzo_malloc(BUFFER_SIZE);
--    inbuf = (lzo_bytep) lzo_malloc(BUFFER_SIZE);
-+    wrkmem = (lzo_bytep) malloc(LZO1X_1_MEM_COMPRESS);
-+    out = (lzo_bytep) malloc(BUFFER_SIZE);
-+    inbuf = (lzo_bytep) malloc(BUFFER_SIZE);
-     
-     if (wrkmem == NULL || out == NULL) {
-       fprintf(stderr, "[%s] out of memory\n", MOD_NAME);
-diff -Naupr transcode-1.0.2.orig/import/import_lzo.c transcode-1.0.2/import/import_lzo.c
---- transcode-1.0.2.orig/import/import_lzo.c	2005-07-04 09:09:33.000000000 +0200
-+++ transcode-1.0.2/import/import_lzo.c	2006-07-31 13:14:12.000000000 +0200
-@@ -117,8 +117,8 @@ MOD_open
-       return(TC_IMPORT_ERROR); 
-     }
- 
--    wrkmem = (lzo_bytep) lzo_malloc(LZO1X_1_MEM_COMPRESS);
--    out = (lzo_bytep) lzo_malloc(BUFFER_SIZE);
-+    wrkmem = (lzo_bytep) malloc(LZO1X_1_MEM_COMPRESS);
-+    out = (lzo_bytep) malloc(BUFFER_SIZE);
- 
-     if (wrkmem == NULL || out == NULL) {
-       printf("[%s] out of memory\n", MOD_NAME);
-@@ -236,8 +236,8 @@ MOD_close
- 
-   if(param->flag == TC_VIDEO) {
- 
--    lzo_free(wrkmem);
--    lzo_free(out);
-+    free(wrkmem);
-+    free(out);
- 
-     if(avifile2!=NULL) {
-       AVI_close(avifile2);

Added: trunk/rpms/transcode/transcode-1.0.3-lzo2.patch
===================================================================
--- trunk/rpms/transcode/transcode-1.0.3-lzo2.patch	                        (rev 0)
+++ trunk/rpms/transcode/transcode-1.0.3-lzo2.patch	2007-05-31 12:58:12 UTC (rev 5463)
@@ -0,0 +1,116 @@
+diff -Naupr transcode-1.0.3.orig/configure transcode-1.0.3/configure
+--- transcode-1.0.3.orig/configure	2007-04-16 20:08:01.000000000 +0200
++++ transcode-1.0.3/configure	2007-05-31 14:13:17.000000000 +0200
+@@ -37043,7 +37043,7 @@ echo "${ECHO_T}default" >&6; }
+   for l in $lzo_ll ; do
+     case $l in
+       -L*) lpaths="$lpaths $l" ;;
+-      -l*) test x"$l" != x"-llzo" && xlibs="$xlibs $l" ;;
++      -l*) test x"$l" != x"-llzo2" && xlibs="$xlibs $l" ;;
+         *) xlf="$xlf $l" ;;
+     esac
+   done
+@@ -37059,13 +37059,13 @@ echo "${ECHO_T}default" >&6; }
+   if test x"lzo" != x"none" ; then
+     save_LDFLAGS="$LDFLAGS"
+     LDFLAGS="$LDFLAGS $lzo_ll"
+-    { echo "$as_me:$LINENO: checking for lzo_version in -llzo" >&5
+-echo $ECHO_N "checking for lzo_version in -llzo... $ECHO_C" >&6; }
++    { echo "$as_me:$LINENO: checking for lzo_version in -llzo2" >&5
++echo $ECHO_N "checking for lzo_version in -llzo2... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_lzo_lzo_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-llzo $LZO_EXTRA_LIBS $LIBS"
++LIBS="-llzo2 $LZO_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -37121,7 +37121,7 @@ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_lzo_lzo_version" >&5
+ echo "${ECHO_T}$ac_cv_lib_lzo_lzo_version" >&6; }
+ if test $ac_cv_lib_lzo_lzo_version = yes; then
+-  LZO_LIBS="$lzo_ll -llzo $LZO_EXTRA_LIBS"
++  LZO_LIBS="$lzo_ll -llzo2 $LZO_EXTRA_LIBS"
+ else
+ 
+ tc_pkg_err="yes"
+diff -Naupr transcode-1.0.3.orig/configure.in transcode-1.0.3/configure.in
+--- transcode-1.0.3.orig/configure.in	2007-04-16 19:51:08.000000000 +0200
++++ transcode-1.0.3/configure.in	2007-05-31 14:13:49.000000000 +0200
+@@ -1018,7 +1018,7 @@ TC_PKG_HAVE(libquicktime, LIBQUICKTIME)
+ dnl
+ dnl LZO
+ dnl
+-TC_PKG_CHECK(lzo, no, LZO, no, [lzo1x.h], lzo, lzo_version, lzo,
++TC_PKG_CHECK(lzo, no, LZO, no, [lzo1x.h], lzo2, lzo_version, lzo2,
+  [http://www.oberhumer.com/opensource/lzo/])
+ TC_PKG_HAVE(lzo, LZO)
+ 
+diff -Naupr transcode-1.0.3.orig/export/export_lzo.c transcode-1.0.3/export/export_lzo.c
+--- transcode-1.0.3.orig/export/export_lzo.c	2005-07-04 09:23:00.000000000 +0200
++++ transcode-1.0.3/export/export_lzo.c	2007-05-31 14:14:24.000000000 +0200
+@@ -84,8 +84,8 @@ MOD_init
+ 	return(TC_EXPORT_ERROR); 
+       }
+ 
+-      wrkmem = (lzo_bytep) lzo_malloc(LZO1X_1_MEM_COMPRESS);
+-      out = (lzo_bytep) lzo_malloc(vob->ex_v_height*vob->ex_v_width*3*2);
++      wrkmem = (lzo_bytep) malloc(LZO1X_1_MEM_COMPRESS);
++      out = (lzo_bytep) malloc(vob->ex_v_height*vob->ex_v_width*3*2);
+ 
+       if (wrkmem == NULL || out == NULL) {
+ 	printf("[%s] out of memory\n", MOD_NAME);
+@@ -270,8 +270,8 @@ MOD_stop 
+   
+   if(param->flag == TC_VIDEO) {
+ 
+-    lzo_free(wrkmem);
+-    lzo_free(out);
++    free(wrkmem);
++    free(out);
+     
+     return(0);
+   }
+diff -Naupr transcode-1.0.3.orig/import/decode_lzo.c transcode-1.0.3/import/decode_lzo.c
+--- transcode-1.0.3.orig/import/decode_lzo.c	2005-07-04 09:23:01.000000000 +0200
++++ transcode-1.0.3/import/decode_lzo.c	2007-05-31 14:14:59.000000000 +0200
+@@ -65,9 +65,9 @@ void decode_lzo(decode_t *decode)
+       goto decoder_error;
+     }
+ 
+-    wrkmem = (lzo_bytep) lzo_malloc(LZO1X_1_MEM_COMPRESS);
+-    out = (lzo_bytep) lzo_malloc(BUFFER_SIZE);
+-    inbuf = (lzo_bytep) lzo_malloc(BUFFER_SIZE);
++    wrkmem = (lzo_bytep) malloc(LZO1X_1_MEM_COMPRESS);
++    out = (lzo_bytep) malloc(BUFFER_SIZE);
++    inbuf = (lzo_bytep) malloc(BUFFER_SIZE);
+     
+     if (wrkmem == NULL || out == NULL) {
+       fprintf(stderr, "[%s] out of memory\n", MOD_NAME);
+diff -Naupr transcode-1.0.3.orig/import/import_lzo.c transcode-1.0.3/import/import_lzo.c
+--- transcode-1.0.3.orig/import/import_lzo.c	2005-07-04 09:23:01.000000000 +0200
++++ transcode-1.0.3/import/import_lzo.c	2007-05-31 14:16:17.000000000 +0200
+@@ -117,8 +117,8 @@ MOD_open
+       return(TC_IMPORT_ERROR); 
+     }
+ 
+-    wrkmem = (lzo_bytep) lzo_malloc(LZO1X_1_MEM_COMPRESS);
+-    out = (lzo_bytep) lzo_malloc(BUFFER_SIZE);
++    wrkmem = (lzo_bytep) malloc(LZO1X_1_MEM_COMPRESS);
++    out = (lzo_bytep) malloc(BUFFER_SIZE);
+ 
+     if (wrkmem == NULL || out == NULL) {
+       printf("[%s] out of memory\n", MOD_NAME);
+@@ -236,8 +236,8 @@ MOD_close
+ 
+   if(param->flag == TC_VIDEO) {
+ 
+-    lzo_free(wrkmem);
+-    lzo_free(out);
++    free(wrkmem);
++    free(out);
+ 
+     if(avifile2!=NULL) {
+       AVI_close(avifile2);

Deleted: trunk/rpms/transcode/transcode-1.0.x-filter-patch.txt
===================================================================
--- trunk/rpms/transcode/transcode-1.0.x-filter-patch.txt	2007-05-31 12:11:34 UTC (rev 5462)
+++ trunk/rpms/transcode/transcode-1.0.x-filter-patch.txt	2007-05-31 12:58:12 UTC (rev 5463)
@@ -1,37 +0,0 @@
-*** src/filter.c.orig	2006-05-28 11:18:22.000000000 +0200
---- src/filter.c	2006-05-28 11:18:51.000000000 +0200
-***************
-*** 150,153 ****
---- 150,156 ----
-      }
-    }
-+   if (strlen(filter[id].name) > MAX_FILTER_NAME_LEN) {
-+     return -1;
-+   }
-  
-    filter_unquote_options(filter[id].options);
-***************
-*** 346,357 ****
-    int id = filter_next_free_id()+1;
-    vob_t *vob = tc_get_vob();
--   long sret;
-  
-    fprintf(stderr, "[%s] Loading (%s) ..\n", __FILE__, mfilter_string);
-  
-    filter[id].namelen = strlen(mfilter_string);
-!   filter[id].name    = (char *) malloc (filter[id].namelen+1);
-!   sret = strlcpy(filter[id].name, mfilter_string, MAX_FILTER_NAME_LEN);
-!   if (tc_test_string(__FILE__, __LINE__, MAX_FILTER_NAME_LEN, sret, errno))
-      return(1);
-  
---- 349,358 ----
-    int id = filter_next_free_id()+1;
-    vob_t *vob = tc_get_vob();
-  
-    fprintf(stderr, "[%s] Loading (%s) ..\n", __FILE__, mfilter_string);
-  
-    filter[id].namelen = strlen(mfilter_string);
-!   filter[id].name    = strdup(mfilter_string);
-!   if (!filter[id].name)
-      return(1);
-  

Modified: trunk/rpms/transcode/transcode.spec
===================================================================
--- trunk/rpms/transcode/transcode.spec	2007-05-31 12:11:34 UTC (rev 5462)
+++ trunk/rpms/transcode/transcode.spec	2007-05-31 12:58:12 UTC (rev 5463)
@@ -2,13 +2,12 @@
 # Authority: matthias
 # Upstream: <transcode-users$exit1.org>
 
-#define prever rc1
-
 %{?dist: %{expand: %%define %dist 1}}
 %{?fedora: %{expand: %%define fc%{fedora} 1}}
 
 %{!?dist:%define _with_modxorg 1}
 %{?el5:  %define _with_modxorg 1}
+%{?fc7:  %define _with_modxorg 1}
 %{?fc6:  %define _with_modxorg 1}
 %{?fc5:  %define _with_modxorg 1}
 
@@ -29,18 +28,14 @@
 
 Summary: Linux video stream processing utility
 Name: transcode
-Version: 1.0.2
-Release: 12%{?prever:.%{prever}}
+Version: 1.0.3
+Release: 1
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.transcoding.org/
-Source: http://www.kraymer.mynetcologne.de/transcode-%{version}%{?prever}.tar.gz
-Patch0: transcode-1.0.2-filter_compare-fixes-try1.patch
-Patch1: transcode-1.0.2-filter_logo-hangup-try1.patch
-Patch2: transcode-1.0.x-filter-patch.txt
-Patch3: transcode-1.0.2-lzo2.patch
-Patch4: transcode-1.0.2-libmpeg3.patch
-Patch5: transcode-1.0.2-libavcodec.patch
+Source: http://fromani.exit1.org/transcode-%{version}.tar.bz2
+Patch0: transcode-1.0.3-lzo2.patch
+Patch1: transcode-1.0.2-libmpeg3.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gcc-c++, gtk+-devel, SDL-devel, libxml2-devel, libjpeg-devel
 BuildRequires: freetype-devel >= 2.0, libogg-devel, libvorbis-devel
@@ -79,13 +74,9 @@
 
 
 %prep
-%setup -n %{name}-%{version}%{?prever}
-%patch0 -p0 -b .filter_compare-fixes-try1
-%patch1 -p0 -b .filter_logo-hangup-try1
-%patch2 -p0 -b .filter-patch
-%patch3 -p1 -b .lzo2
-%patch4 -p1 -b .libmpeg3
-%patch5 -p1 -b .libavcodec
+%setup
+%patch0 -p1 -b .lzo2
+%patch1 -p1 -b .libmpeg3
 
 
 %build
@@ -144,6 +135,11 @@
 
 
 %changelog
+* Fri Apr 20 2007 Matthias Saou <http://freshrpms.net/> 1.0.3-1
+- Update to 1.0.3.
+- Update lzo2 patch.
+- Remove all now unneeded patches.
+
 * Thu Jan 11 2007 Dag Wieers <dag at wieers.com> - 1.0.2-12
 - Rebuild against newer ffmpeg and mjpegtools.
 




More information about the commits mailing list